慢病，药品账页字典，技术文档等优化

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

@@ -14,11 +14,12 @@ 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(f.name) as creatIdName " +
+            " rtrim(p.name) as referPhysicianName, rtrim(f.name) as creatIdName, j.name as deptName " +
             " 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 " +
+            " left join zd_unit_code j on mi.creat_dept = j.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);
@@ -52,11 +53,12 @@ public interface CrmPatientMiDao extends BaseMapper<CrmPatientMi> {
     @Select("<script> " +
             " select 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, j.name as deptName " +
             " 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 " +
+            " left join zd_unit_code j on mi.creat_dept = j.code collate Chinese_PRC_BIN " +
             " where (mi.social_no like '%${keyCode}%' or mi.his_mz_no like '%${keyCode}%' " +
             " or mi.his_zy_no like '%${keyCode}%' or mi.p_name like '%${keyCode}%')" +
             "<if test=\"startTime != null and startTime != '' \">" +
@@ -74,6 +76,9 @@ public interface CrmPatientMiDao extends BaseMapper<CrmPatientMi> {
             "<if test=\"delFlag == '1'.toString() \">" +
             " and mi.del_flag = '1'  " +
             "</if>" +
+            "<if test=\"deptCode != null and deptCode != '' \">" +
+            " and mi.creat_dept like '%${deptCode}%'  " +
+            "</if>" +
             " order by mi.create_date " +
             "</script> ")
     List<CrmPatientMi> selectChronicDisease(CrmPatientVo vo);

src/main/java/thyyxxk/webserver/dao/his/dictionary/BedDeptDictDao.java

@@ -6,7 +6,6 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
-import thyyxxk.webserver.entity.yp.YpZdClass;
 
 import java.util.List;
 import java.util.Map;

src/main/java/thyyxxk/webserver/dao/his/dictionary/ZdUnitCodeDao.java

@@ -11,11 +11,12 @@ public interface ZdUnitCodeDao extends BaseMapper<ZdUnitCode> {
 
     @Select("<script>" +
             "  select d.code, d.name, d.py_code as pyCode, d.d_code as dCode from zd_unit_code as d  " +
-            "   where isnull(d.py_code,'') like '${text}%' " +
+            "   where isnull(d.del_flag, '0') = '0' " +
+            "    and (isnull(d.py_code,'') like '${text}%' " +
             "     or isnull(d.d_code,'') like '${text}%' " +
             "     or isnull(d.code,'') like '${text}%' " +
             "     or isnull(d.n_code,'') like '${text}%' " +
-            "     or isnull(d.name,'') like '${text}%' " +
+            "     or isnull(d.name,'') like '${text}%') " +
             "</script>")
     List<ZdUnitCode> selectZdUnitCode(@Param("text") String text);
 

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

@@ -243,6 +243,10 @@ public class CrmPatientMi implements Serializable {
      * 是否有效（1: 无效）
      */
     private String delFlag;
+    /**
+     * 建档科室（id）
+     */
+    private String creatDept;
     /**
      * 身高
      */

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

@@ -17,5 +17,5 @@ public class CrmPatientVo {
     private String keyCode;
     private String diseaseType;
     private String delFlag;
-
+    private String deptCode;
 }

src/main/java/thyyxxk/webserver/service/chronicDisease/ChronicDiseaseService.java

@@ -187,8 +187,7 @@ public class ChronicDiseaseService {
             resultMap.put("cg", "保存慢特病基本信息成功！");
             return ResultVoUtil.success(resultMap);
         } catch(Exception e){
-            e.printStackTrace();
-            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "保存慢特病基本信息失败！");
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "保存慢特病基本信息失败！" + e.getMessage());
         }
 
     }