Merge remote-tracking branch 'origin/dev/cdssman20200727_init' into dev/cdssman20200727_init

cdssman-service/src/main/java/com/diagbot/entity/HospitalInfo.java

@@ -55,8 +55,8 @@ public class HospitalInfo implements Serializable {
     /**
      * 医院编码
      */
-    @NotBlank(message = "医院编码不能为空")
-    private String code;
+    /*@NotBlank(message = "医院编码不能为空")
+    private String code;*/
 
     /**
      * 医院名称
@@ -142,13 +142,13 @@ public class HospitalInfo implements Serializable {
         this.modifier = modifier;
     }
 
-    public String getCode() {
+    /*public String getCode() {
         return code;
     }
 
     public void setCode(String code) {
         this.code = code;
-    }
+    }*/
 
     public String getName() {
         return name;
@@ -215,7 +215,7 @@ public class HospitalInfo implements Serializable {
                 ", gmtModified=" + gmtModified +
                 ", creator=" + creator +
                 ", modifier=" + modifier +
-                ", code=" + code +
+                /*", code=" + code +*/
                 ", name=" + name +
                 ", address=" + address +
                 ", spell=" + spell +

cdssman-service/src/main/java/com/diagbot/facade/DeptConfigFacade.java

@@ -393,7 +393,8 @@ public class DeptConfigFacade {
     public void exportExcel(HttpServletResponse response, HospitalIdVO hospitalIdVO) {
         QueryWrapper<DeptConfig> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("hospital_id", hospitalIdVO.getHospitalId());
+                .eq("hospital_id", hospitalIdVO.getHospitalId())
+                .orderByDesc("gmt_modified");
         List<DeptConfig> records = deptConfigService.list(queryWrapper);
         String fileName = "科室映射.xls";
         ExcelUtils.exportExcel(records, null, "sheet1", DeptConfig.class, fileName, response, 12.8f);

cdssman-service/src/main/java/com/diagbot/facade/DiseaseConfigFacade.java

@@ -380,7 +380,8 @@ public class DiseaseConfigFacade {
     public void exportExcel(HttpServletResponse response, HospitalIdVO hospitalIdVO) {
         QueryWrapper<DiseaseConfig> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("hospital_id", hospitalIdVO.getHospitalId());
+                .eq("hospital_id", hospitalIdVO.getHospitalId())
+                .orderByDesc("gmt_modified");
         List<DiseaseConfig> records = diseaseConfigService.list(queryWrapper);
         String fileName = "疾病映射.xls";
         ExcelUtils.exportExcel(records, null, "sheet1", DiseaseConfig.class, fileName, response, 12.8f);

cdssman-service/src/main/java/com/diagbot/facade/DrugConfigFacade.java

@@ -583,7 +583,8 @@ public class DrugConfigFacade {
     public void exportExcel(HttpServletResponse response, HospitalIdVO hospitalIdVO) {
         QueryWrapper<DrugConfig> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("hospital_id", hospitalIdVO.getHospitalId());
+                .eq("hospital_id", hospitalIdVO.getHospitalId())
+                .orderByDesc("gmt_modified");
         List<DrugConfig> records = drugConfigService.list(queryWrapper);
         String fileName = "药品映射.xls";
         ExcelUtils.exportExcel(records, getFrom(), "sheet1", DrugConfig.class, fileName, response, 12.8f);

cdssman-service/src/main/java/com/diagbot/facade/HospitalInfoFacade.java

@@ -109,7 +109,7 @@ public class HospitalInfoFacade extends HospitalInfoServiceImpl {
                 throw new CommonException(CommonErrorCode.IS_EXISTS, "该医院名称已存在");
             }
         }
-        if (StringUtil.isNotBlank(hospitalInfo.getCode())) {
+        /*if (StringUtil.isNotBlank(hospitalInfo.getCode())) {
             queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
             queryWrapper.eq("code", hospitalInfo.getCode());
@@ -123,7 +123,7 @@ public class HospitalInfoFacade extends HospitalInfoServiceImpl {
                     && !hospitalInfo.getId().equals(oldRecord.getId())) {
                 throw new CommonException(CommonErrorCode.IS_EXISTS, "该医院编码已存在");
             }
-        }
+        }*/
 
         //新增数据
         if (hospitalInfo.getId() == null) {

cdssman-service/src/main/java/com/diagbot/facade/LisConfigFacade.java

@@ -457,7 +457,8 @@ public class LisConfigFacade{
     public void exportExcel(HttpServletResponse response, HospitalIdVO hospitalIdVO) {
         QueryWrapper<LisConfig> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("hospital_id", hospitalIdVO.getHospitalId());
+                .eq("hospital_id", hospitalIdVO.getHospitalId())
+                .orderByDesc("gmt_modified");
         List<LisConfig> records = lisConfigService.list(queryWrapper);
         String fileName = "检验映射.xls";
         ExcelUtils.exportExcel(records, null, "sheet1", LisConfig.class, fileName, response, 12.8f);

cdssman-service/src/main/java/com/diagbot/facade/OperationConfigFacade.java

@@ -389,7 +389,8 @@ public class OperationConfigFacade {
     public void exportExcel(HttpServletResponse response, HospitalIdVO hospitalIdVO) {
         QueryWrapper<OperationConfig> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("hospital_id", hospitalIdVO.getHospitalId());
+                .eq("hospital_id", hospitalIdVO.getHospitalId())
+                .orderByDesc("gmt_modified");
         List<OperationConfig> records = operationConfigService.list(queryWrapper);
         String fileName = "手术映射.xls";
         ExcelUtils.exportExcel(records, null, "sheet1", OperationConfig.class, fileName, response, 12.8f);

cdssman-service/src/main/java/com/diagbot/facade/PacsConfigFacade.java

@@ -387,7 +387,8 @@ public class PacsConfigFacade {
     public void exportExcel(HttpServletResponse response, HospitalIdVO hospitalIdVO) {
         QueryWrapper<PacsConfig> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("hospital_id", hospitalIdVO.getHospitalId());
+                .eq("hospital_id", hospitalIdVO.getHospitalId())
+                .orderByDesc("gmt_modified");
         List<PacsConfig> records = pacsConfigService.list(queryWrapper);
         String fileName = "检查映射.xls";
         ExcelUtils.exportExcel(records, null, "sheet1", PacsConfig.class, fileName, response, 12.8f);

cdssman-service/src/main/java/com/diagbot/facade/TransfusionConfigFacade.java

@@ -387,7 +387,8 @@ public class TransfusionConfigFacade {
     public void exportExcel(HttpServletResponse response, HospitalIdVO hospitalIdVO) {
         QueryWrapper<TransfusionConfig> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("hospital_id", hospitalIdVO.getHospitalId());
+                .eq("hospital_id", hospitalIdVO.getHospitalId())
+                .orderByDesc("gmt_modified");
         List<TransfusionConfig> records = transfusionConfigService.list(queryWrapper);
         String fileName = "输血映射.xls";
         ExcelUtils.exportExcel(records, null, "sheet1", TransfusionConfig.class, fileName, response, 12.8f);

cdssman-service/src/main/java/com/diagbot/vo/HospitalInfoPageVO.java

@@ -15,7 +15,7 @@ public class HospitalInfoPageVO extends Page {
     /**
      * 医院编码
      */
-    private String code;
+    /*private String code;*/
 
     /**
      * 医院名称

cdssman-service/src/main/resources/mapper/HospitalInfoMapper.xml

@@ -10,7 +10,7 @@
         <result column="gmt_modified" property="gmtModified" />
         <result column="creator" property="creator" />
         <result column="modifier" property="modifier" />
-        <result column="code" property="code" />
+        <!--<result column="code" property="code" />-->
         <result column="name" property="name" />
         <result column="address" property="address" />
         <result column="spell" property="spell" />
@@ -25,9 +25,9 @@
         select a.*
         from tran_hospital_info a
         where a.is_deleted='N'
-        <if test="hospitalInfoPageVO.code!=null and hospitalInfoPageVO.code!=''">
+        <!--<if test="hospitalInfoPageVO.code!=null and hospitalInfoPageVO.code!=''">
             and a.code like concat("%",#{hospitalInfoPageVO.code},"%")
-        </if>
+        </if>-->
         <if test="hospitalInfoPageVO.name!=null and hospitalInfoPageVO.name!=''">
             and a.name like concat("%",#{hospitalInfoPageVO.name},"%")
         </if>

cdssman-service/src/main/resources/mapper/UserRoleMapper.xml

@@ -42,5 +42,6 @@
         <if test="hospitalId !=null">
             and hospital_id = #{hospitalId}
         </if>
+        ORDER BY a.gmt_modified DESC
     </select>
 </mapper>