Merge branch 'master' into 'master'

增加主键注解以及慢病优化

See merge request lighter/web-server!71

src/main/java/thyyxxk/webserver/dao/his/chronicDisease/CrmPatientMiDao.java

@@ -9,10 +9,12 @@ import thyyxxk.webserver.entity.chronicDisease.CrmPatientMi;
 public interface CrmPatientMiDao extends BaseMapper<CrmPatientMi> {
 
     @Select(" select top 1 mi.*, tz.height, tz.weight, tz.temperature, tz.respiratory_rate, tz.heart_rate, " +
-            " tz.blood_sugar, tz.blood_pressure_high, tz.blood_pressure_low, tz.blood_oxygen, rtrim(p.name) as referPhysicianName " +
+            " tz.blood_sugar, tz.blood_pressure_high, tz.blood_pressure_low, tz.blood_oxygen, rtrim(f.name) as userName, " +
+            " rtrim(p.name) as referPhysicianName " +
             " from crm_patient_mi mi" +
             " left join crm_patient_tzxx tz on (mi.p_id = tz.p_id collate Chinese_PRC_BIN) and mi.visit_times = tz.visit_times " +
             " left join a_employee_mi p on mi.refer_physician = p.code collate Chinese_PRC_BIN " +
+            " left join a_employee_mi f on mi.creat_id = f.code collate Chinese_PRC_BIN " +
             " where mi.social_no = #{keyCode} or mi.his_mz_no = #{keyCode} or mi.his_zy_no = #{keyCode} or mi.his_tj_no = #{keyCode}" +
             " or mi.p_name = #{keyCode} or mi.p_id = #{keyCode} ")
     CrmPatientMi selectCrmPatientMiByCode(@Param("keyCode") String keyCode);

src/main/java/thyyxxk/webserver/entity/chronicDisease/CrmPatientTzxx.java

@@ -1,5 +1,7 @@
 package thyyxxk.webserver.entity.chronicDisease;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
@@ -22,6 +24,7 @@ public class CrmPatientTzxx implements Serializable  {
     /**
      * 用户id
      */
+    @TableId(value = "p_id", type = IdType.NONE)
     private String pId;
     /**
      * 随访次数

src/main/java/thyyxxk/webserver/entity/chronicDisease/CrmVisitRecord.java

@@ -1,7 +1,9 @@
 package thyyxxk.webserver.entity.chronicDisease;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
@@ -29,6 +31,7 @@ public class CrmVisitRecord implements Serializable {
     /**
      * 患者id
      */
+    @TableId(value = "p_id", type = IdType.NONE)
     @JsonProperty("pId")
     private String pId;
     /**

src/main/java/thyyxxk/webserver/entity/dictionary/EmployeeMi.java

@@ -1,6 +1,8 @@
 package thyyxxk.webserver.entity.dictionary;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
@@ -18,7 +20,7 @@ import java.util.Date;
 @TableName(value = "a_employee_mi")
 public class EmployeeMi implements Serializable {
     private static final long serialVersionUID = -1L;
-
+    @TableId(value = "code", type = IdType.NONE)
     private String code;
     private String deptCode;
     private String name;

src/main/java/thyyxxk/webserver/entity/dictionary/ZdEducationCode.java

@@ -1,5 +1,7 @@
 package thyyxxk.webserver.entity.dictionary;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
@@ -16,7 +18,7 @@ import java.io.Serializable;
 @TableName(value = "zd_education_code")
 public class ZdEducationCode implements Serializable {
     private static final long serialVersionUID = -1L;
-
+    @TableId(value = "code", type = IdType.NONE)
     private String code;
     private String name;
     private String pyCode;

src/main/java/thyyxxk/webserver/entity/dictionary/ZdEmpInmark.java

@@ -1,5 +1,7 @@
 package thyyxxk.webserver.entity.dictionary;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
@@ -16,7 +18,7 @@ import java.io.Serializable;
 @TableName(value = "zd_emp_inmark")
 public class ZdEmpInmark implements Serializable {
     private static final long serialVersionUID = -1L;
-
+    @TableId(value = "code", type = IdType.NONE)
     private String code;
     private String name;
     private String pyCode;

src/main/java/thyyxxk/webserver/entity/dictionary/ZdEmpPosition.java

@@ -1,5 +1,7 @@
 package thyyxxk.webserver.entity.dictionary;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
@@ -17,7 +19,7 @@ import java.io.Serializable;
 public class ZdEmpPosition implements Serializable {
 
     private static final long serialVersionUID = -1L;
-
+    @TableId(value = "code", type = IdType.NONE)
     private String code;
     private String name;
     private String pyCode;

src/main/java/thyyxxk/webserver/entity/dictionary/ZdEmpTitle.java

@@ -1,5 +1,7 @@
 package thyyxxk.webserver.entity.dictionary;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
@@ -16,7 +18,7 @@ import java.io.Serializable;
 @TableName(value = "zd_emp_title")
 public class ZdEmpTitle implements Serializable {
     private static final long serialVersionUID = -1L;
-
+    @TableId(value = "code", type = IdType.NONE)
     private String code;
     private String name;
     private String pyCode;

src/main/java/thyyxxk/webserver/entity/dictionary/ZdIfcadre.java

@@ -1,5 +1,7 @@
 package thyyxxk.webserver.entity.dictionary;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
@@ -16,7 +18,7 @@ import java.io.Serializable;
 @TableName(value = "zd_ifcadre")
 public class ZdIfcadre implements Serializable {
     private static final long serialVersionUID = -1L;
-
+    @TableId(value = "code", type = IdType.NONE)
     private String code;
     private String name;
     private String pyCode;

src/main/java/thyyxxk/webserver/entity/dictionary/ZdUnitClass.java

@@ -1,5 +1,7 @@
 package thyyxxk.webserver.entity.dictionary;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
@@ -16,7 +18,7 @@ import java.io.Serializable;
 @TableName(value = "zd_unit_class")
 public class ZdUnitClass implements Serializable {
     private static final long serialVersionUID = -1L;
-
+    @TableId(value = "code", type = IdType.NONE)
     private String code;
     private String name;
     private String pyCode;

src/main/java/thyyxxk/webserver/entity/highreport/ReportBaseInfo.java

@@ -1,6 +1,8 @@
 package thyyxxk.webserver.entity.highreport;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
@@ -17,7 +19,7 @@ import java.util.Map;
 @Data
 @TableName("report_base_info")
 public class ReportBaseInfo implements Serializable {
-
+    @TableId(value = "report_id", type = IdType.NONE)
     private String reportId;
     private String reportName;
     /**

src/main/java/thyyxxk/webserver/entity/highreport/TableGroupInfo.java

@@ -1,5 +1,7 @@
 package thyyxxk.webserver.entity.highreport;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
@@ -12,7 +14,7 @@ import lombok.Data;
 @Data
 @TableName("table_group_info")
 public class TableGroupInfo {
-
+    @TableId(value = "level_id", type = IdType.NONE)
     private String levelId;
     private String levelName;
     private String fstGroup;