医保统筹问题

apply/apply-service/src/main/resources/mapper/ChDisableApplyMapper.xml

@@ -120,8 +120,6 @@
                a.CHECK_REMARK               checkRemark,
                a.REASONS_REVIEW             reasonsReview,
                a.REASONS_REMARK             reasonsRemark,
-               a.MEDICAL_PROVINCIAL       medicalProvincial,
-               a.MEDICAL_CITY               medicalCity,
                a.MEDICAL_AREA               medicalArea,
                a.BANK_CARD_NO bankCardNo
         from CH_DISABLE_APPLY a

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/disable/ChDisableApply.java

@@ -610,12 +610,12 @@ public class ChDisableApply extends PageInfo implements Serializable {
     /**
      *医保统筹区省
      */
-    private String medicalProvincial;
+   // private String medicalProvincial;
 
     /**
      *医保统筹区市
      */
-    private String medicalCity;
+    //private String medicalCity;
 
     /**
      *医保统筹区区

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/disable/DisableExamineInfoVO.java

@@ -34,12 +34,12 @@ public class DisableExamineInfoVO {
     /**
      *医保统筹区省
      */
-    private String medicalProvincial;
+   // private String medicalProvincial;
 
     /**
      *医保统筹区市
      */
-    private String medicalCity;
+   // private String medicalCity;
 
     /**
      *医保统筹区区

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

@@ -6,7 +6,7 @@
     <select id="queryPlan"   resultType="com.hungraim.ltc.pojo.entity.governance.ChSrvPlan">
         select
         disable.DISAB_INFO_ID disabInfoId,
-        mode1.MODE_ID modeId,
+        disable.SRV_MODE_ID modeId,
         --护理机构名称
         organ.srv_organ_id srvOrganId,
         emp.emp_id empId,
@@ -22,15 +22,12 @@
         left join CH_DEV.CH_DISABLE_APPLY apply on apply.apply_id = disable.apply_id
         left join ch_srv_program program on task.program_id = program.program_id--服务方案
         left join ch_srv_organ organ on program.srv_organ_id = organ.srv_organ_id--服务机构
-        left join ch_cfg_srv_mode mode1 on program.srv_mode_id = mode1.mode_id--服务方式
         left join ch_srv_organ_emp emp on task.srv_emp_id = emp.emp_id--护理人员
             left join   CH_SRV_PROGRAM_SET   CSTFI on CSTFI.PROGRAM_ID = task.program_id
             LEFT JOIN CH_SRV_ORGAN_PROJECT CSOP ON CSOP.PROJECT_ID = CSTFI.ITEM_ID
         LEFT JOIN CH_SERVICE_TYPE_detailed d on d.service_type_detailed_id = CSOP.item_name
         <where>
-            mode1.mode_name   in ('医疗','养老') and program.program_id =#{programId}
-
-
+            disable.SRV_MODE_ID   in ('1','2') and program.program_id =#{programId}
         </where>
         order by detail.SRV_DATE desc
     </select>