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

cdssman-service/src/main/java/com/diagbot/dto/UserRoleInfoFindDTO.java

@@ -4,7 +4,8 @@ import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.sql.Date;
+import java.util.Date;
+
 
 /**
  * @author wangfeng

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/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/PlanFacade.java

@@ -3,7 +3,6 @@ package com.diagbot.facade;
 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.diagbot.dto.HospitalInfoDTO;
 import com.diagbot.dto.PlanDetailDTO;
 import com.diagbot.dto.PlanInfoDefaultDTO;
 import com.diagbot.dto.PlanInfoPagesDTO;
@@ -134,12 +133,14 @@ public class PlanFacade extends PlanServiceImpl {
         IPage<PlanInfoPagesDTO> data = getPlanInfoPageAll(hospitalPlanPageVO);
         List<PlanInfoPagesDTO> planInfos = data.getRecords();
         List<Long> hospitaIds = new ArrayList<>();
-        for(PlanInfoPagesDTO h:planInfos){
+        for (PlanInfoPagesDTO h : planInfos) {
             hospitaIds.add(h.getHospitalId());
         }
-        Map<Long, String> hospitalInfo = hospitalInfoFacade.getHospitalInfoData(hospitaIds);
-        for(PlanInfoPagesDTO planInfodata:planInfos){
-            planInfodata.setHospitalName(hospitalInfo.get(planInfodata.getHospitalId()));
+        if (ListUtil.isNotEmpty(hospitaIds)) {
+            Map<Long, String> hospitalInfo = hospitalInfoFacade.getHospitalInfoData(hospitaIds);
+            for (PlanInfoPagesDTO planInfodata : planInfos) {
+                planInfodata.setHospitalName(hospitalInfo.get(planInfodata.getHospitalId()));
+            }
         }
         // 取版本id查明细
         List<Long> ids = new ArrayList<>();
@@ -316,7 +317,7 @@ public class PlanFacade extends PlanServiceImpl {
 
         }
         Map<Long, String> hospitalInfo = hospitalInfoFacade.getHospitalInfoData(hospitaIds);
-        if(ListUtil.isEmpty(planId)){
+        if (ListUtil.isEmpty(planId)) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "该数据不存在！");
         }
         HospitalSetVO hospitalSetVO = new HospitalSetVO();

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/ConceptInfoMapper.xml

@@ -61,7 +61,7 @@
         ) t1
         LEFT JOIN sys_user t2 ON t1.modifier = t2.id
         ORDER BY
-        t1.status ASC,
+        t1.status DESC,
         t1.gmtModified DESC
     </select>
 

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>

user-service/src/main/resources/mapper/UserMapper.xml

@@ -7,6 +7,7 @@
     <resultMap id="BaseResultMap" type="com.diagbot.entity.User">
         <id column="id" property="id" />
         <result column="is_deleted" property="isDeleted" />
+        <result column="gmt_create" property="gmtCreate" />
         <result column="gmt_modified" property="gmtModified" />
         <result column="creator" property="creator" />
         <result column="modifier" property="modifier" />