服务方案详情接口调整。新增诊断疾病数据返回，优化诊断疾病查询方式

apply/apply-service/src/main/java/com/hungraim/ltc/controller/DisableController.java

@@ -99,11 +99,23 @@ public class DisableController {
      */
     @RequestMapping("/fndDiseaseList")
     public Result<List<ChFndDiseaseType>> fndDiseaseList(String parDiseTypeId) {
+        if (StrUtil.isNotBlank(parDiseTypeId)) {
+            return Result.failed("参数错误");
+        }
         List<ChFndDiseaseType> chFndDiseaseTypes = disableService.fndDiseaseList(parDiseTypeId);
         return Result.success(chFndDiseaseTypes);
     }
 
     /**
+     * 查询所有疾病数据
+     */
+    @RequestMapping("/fndAllDisease")
+    public Result<List<ChFndDiseaseType>> fndAllDisease() {
+        List<ChFndDiseaseType> chFndDiseaseTypes = disableService.fndAllDisease();
+        return Result.success(chFndDiseaseTypes);
+    }
+
+    /**
      * 查询护理机构下所有子机构id
      *
      * @param organId 机构id

apply/apply-service/src/main/java/com/hungraim/ltc/service/DisableService.java

@@ -100,4 +100,9 @@ public interface DisableService {
      * @return 返回树形结构省市区数据
      */
     List<DistrictTreeVo> getAllDistrictTreeData();
+
+    /**
+     * 查询所有疾病数据
+     */
+    List<ChFndDiseaseType> fndAllDisease();
 }

apply/apply-service/src/main/java/com/hungraim/ltc/service/impl/DisableServiceImpl.java

@@ -218,4 +218,11 @@ public class DisableServiceImpl implements DisableService {
     public List<DistrictTreeVo> getAllDistrictTreeData() {
         return districtMapper.getAllDistrictTreeData();
     }
+
+    @Override
+    public List<ChFndDiseaseType> fndAllDisease() {
+        QueryWrapper<ChFndDiseaseType> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("IS_VALID", "0");
+        return fndDiseaseTypeMapper.selectList(queryWrapper);
+    }
 }
\ No newline at end of file

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/governance/ProgramDetailVo.java

@@ -96,7 +96,7 @@ public class ProgramDetailVo {
     /**
      * 评定完成日期
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date assessDate;
 
     /**
@@ -112,13 +112,13 @@ public class ProgramDetailVo {
     /**
      * 方案生效时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date programDate;
 
     /**
      * 方案结束时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date programEndDate;
 
     /**

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/governance/ProgramSetAndProjectVo.java

@@ -60,7 +60,7 @@ public class ProgramSetAndProjectVo {
     /**
      * 是否配置 (是：1；否：0)
      */
-    private Short isConf;
+    private Short isConf = 1;
 
     /**
      * 计划频次
@@ -70,6 +70,6 @@ public class ProgramSetAndProjectVo {
     /**
      * 计划频次类型(1：次/每月，2：次/每天，3：次/每周；)
      */
-    private Short planningFrequencyType;
+    private Short planningFrequencyType = 1;
 
 }

governance/src/main/resources/com/hungraim/ltc/governance/mapper/ChSrvProgramMapper.xml

@@ -29,6 +29,7 @@
         <result column="PROG_STATUS" property="progStatus"/>
         <result column="program" property="programDate"/>
         <result column="PROGRAM_EDN_DATE" property="programEndDate"/>
+        <result column="PROGRAM_DATE" property="programDate"/>
         <collection property="programSetAndProjectVos" column="SRV_ORGAN_ID"
                     select="com.hungraim.ltc.governance.dao.ChSrvOrganProjectMapper.selectOrganProjectsBySrvOrganId"/>
     </resultMap>
@@ -56,6 +57,8 @@
                T7.SRV_MODE_NAME,
                T5.SRV_ORGAN_NAME,
                T1.PROG_STATUS,
+               T1.PROGRAM_DATE,
+               T1.PROGRAM_EDN_DATE,
                T1.EFF_TIME
         FROM CH_SRV_PROGRAM T1
                  INNER JOIN CH_DISABLE_INFO T2 ON T1.DISAB_INFO_ID = T2.DISAB_INFO_ID
@@ -87,7 +90,9 @@
                T6.DISABLE_LEVEL_NAME,
                T4.FINISH_TIME,
                T7.SRV_MODE_NAME,
-               T5.SRV_ORGAN_NAME
+               T5.SRV_ORGAN_NAME,
+               T1.ALLOT_TIME PROGRAM_DATE,
+               T1.STOP_TIME  PROGRAM_EDN_DATE
         FROM CH_SRV_SEND T1
                  INNER JOIN CH_DISABLE_INFO T2 ON T1.DISAB_INFO_ID = T2.DISAB_INFO_ID
                  LEFT JOIN CH_FND_SRV_MODE T7 ON T2.SRV_MODE_ID = T7.SRV_MODE_ID