add 临床新增字段 manageType 0、院内管理 1、居家管理

nb-service-api/web-service-api/src/main/java/com/nb/web/api/entity/BusClinicEntity.java

@@ -7,6 +7,7 @@ import com.nb.web.api.bean.UndoDeviceConfig;
 import com.nb.core.entity.TenantGenericEntity;
 import com.nb.core.enums.SexEnum;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.nb.web.api.enums.ClinicManageEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -151,4 +152,7 @@ public class BusClinicEntity extends TenantGenericEntity<String,String> {
     @TableField(updateStrategy = FieldStrategy.NEVER)
     private String visitRecord;
 
+    @ApiModelProperty(value = "管理类型",allowableValues = "0(院内管理);1(居家管理)")
+    private ClinicManageEnum manageType;
+
 }

nb-service-api/web-service-api/src/main/java/com/nb/web/api/enums/ClinicManageEnum.java

@@ -0,0 +1,30 @@
+package com.nb.web.api.enums;
+
+import com.baomidou.mybatisplus.annotation.IEnum;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @author lifang
+ * @version 1.0.0
+ * @ClassName ClinicManageEnum.java
+ * @Description 临床管理类型
+ * @createTime 2022年08月10日 16:13:00
+ */
+@AllArgsConstructor
+@JsonFormat(shape = JsonFormat.Shape.OBJECT)
+public enum  ClinicManageEnum  implements IEnum<Integer> {
+    hospital(0,"院内管理"),
+    family(1,"居家管理");
+    /**
+     * 与枚举ordinal保持一致
+     */
+    @Getter
+    @ApiModelProperty("运行状态编码")
+    private Integer value;
+    @Getter
+    @ApiModelProperty("运行状态内容")
+    private String text;
+    }

nb-service-api/web-service-api/src/main/java/com/nb/web/api/feign/query/PatientMonitorQuery.java

@@ -109,6 +109,9 @@ public class PatientMonitorQuery  implements Serializable {
     @ApiModelProperty(value = "医院id",hidden = true)
     @JsonIgnore
     private String tenantId;
+
+    @ApiModelProperty(value = "管理类型",allowableValues = "0(院内管理);1(居家管理)")
+    private Integer manageType;
     /**
      * 将前端的提醒查询做统一封装，做请求处理
      * @param warns

nb-service-api/web-service-api/src/main/java/com/nb/web/api/feign/result/PatientMonitorResult.java

@@ -197,6 +197,9 @@ public class PatientMonitorResult implements Serializable {
     @JsonIgnore
     private FlowStatusEnum warnFlow;
 
+    @ApiModelProperty(value = "管理类型",example = "0、院内管理 1、居家管理")
+    private ClinicManageEnum manageType;
+
     @ApiModelProperty("提醒字段")
     private String warns;
 

nb-service/app-doctor/src/main/java/com/nb/app/doctor/service/LocalAppDoctorUserService.java

@@ -10,8 +10,8 @@ import com.nb.app.doctor.api.feign.IAppDoctorUserClient;
 import com.nb.app.doctor.mapper.AppDoctorUserMapper;
 import com.nb.auth.utils.SecurityUtil;
 import com.nb.common.crud.BaseService;
+import com.nb.core.enums.StatusEnum;
 import com.nb.core.exception.CustomException;
-import org.hibernate.validator.constraints.Length;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -42,6 +42,9 @@ public class LocalAppDoctorUserService extends BaseService<AppDoctorUserMapper,
         AppDoctorUserEntity doctor = this.getOne(new QueryWrapper<AppDoctorUserEntity>()
                 .lambda().eq(AppDoctorUserEntity::getUsername, username)
                 .last("limit 1"));
+        if(entity.getStatus()==null){
+            entity.setStatus(StatusEnum.YES);
+        }
         if(doctor!=null){
             throw new CustomException(String.format("用户名{%s}已存在,不可重复添加",username));
         }

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/LocalBusClinicService.java

@@ -3,6 +3,7 @@ package com.nb.web.service.bus.service;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.nb.web.api.enums.ClinicManageEnum;
 import com.nb.web.service.bus.controller.vo.ClinicStatsVo;
 import com.nb.web.api.entity.BusClinicEntity;
 import com.nb.web.api.entity.BusInfusionHistoryEntity;
@@ -55,6 +56,9 @@ public class LocalBusClinicService extends BaseService<BusClinicMapper, BusClini
         if(entity.getStartTime()==null){
             entity.setStartTime(entity.getMonitorStartTime());
         }
+        if(entity.getManageType()==null){
+            entity.setManageType(ClinicManageEnum.hospital);
+        }
 
     }
 

nb-service/web-service/src/main/resources/mapper/bus/BusPatientMapper.xml

@@ -79,6 +79,7 @@
         <result column="monitor_start_time" property="monitorStartTime"/>
         <result column="eval_time" property="evalTime"/>
         <result column="patient_id" property="patientId"/>
+        <result column="manage_type" property="manageType"/>
     </resultMap>
 
     <resultMap id="deviceNone" type="com.nb.web.service.bus.service.dto.PatientDeviceNoneResult">
@@ -210,7 +211,8 @@
         c.surgery_name as surgery_name,
         c.ward as ward,
         c.bed_no as bed_no,
-        c.eval_time as eval_time
+        c.eval_time as eval_time,
+        c.manage_type as manage_type
         from
         (select * from bus_patient
         <where>
@@ -317,6 +319,9 @@
             <if test="query.tenantId!=null">
                 and tenant_id=#{query.tenantId}
             </if>
+            <if test="query.manageType!=null">
+                and manage_type=#{query.manageType}
+            </if>
         </where>
         ) c on p.clinic_id=c.id
         <if test="query.bedNo!=null || query.name!=null || query.code!=null || query.anaDoctor!=null || query.surgeName!=null ||query.gender!=null ||query.anaType!=null || query.deviceId != null">