Merge branch 'master' into 'master'

慢病回显修复

See merge request lighter/web-server!82

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

@@ -13,7 +13,7 @@ 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(f.name) as userName, " +
-            " rtrim(p.name) as referPhysicianName " +
+            " rtrim(p.name) as referPhysicianName, rtrim(f.name) as creatIdName " +
             " 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 " +

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

@@ -365,4 +365,7 @@ public class CrmPatientMi implements Serializable {
     @TableField(exist = false)
     private long days;
 
+    @TableField(exist = false)
+    private String creatIdName;
+
 }