失能人员信息列表

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

@@ -31,10 +31,10 @@ public class DisableController {
      * @param districtProvincial 所在省
      * @param districtCity       所在市
      * @param districtArea       所在区域
-     * @param realName           参保人员姓名
-     * @param certiCode          参保人身份证号码
-     * @param treatmentType      待遇类型
-     * @param applyStatus        审核状态
+     * @param realName           失能人员姓名
+     * @param certiCode          失能人员身份证号码
+     * @param dataFrom           申请来源
+     * @param srvOrganId         护理机构
      * @param pageNum            当前页
      * @param pageSize           每页几条数据
      * @return 失能人员信息列表
@@ -42,10 +42,10 @@ public class DisableController {
     @RequestMapping("/disableList")
     public Result<List<DisableVO>> disableList(String organId, String districtProvincial,
                                                String districtCity, String districtArea,
-                                               String realName, String certiCode, String treatmentType,
-                                               String applyStatus, int pageNum, int pageSize) {
+                                               String realName, String certiCode, String dataFrom,
+                                               String srvOrganId, int pageNum, int pageSize) {
         IPage<DisableVO> iPage = disableService.disableList(organId, districtProvincial,
-                districtCity, districtArea, realName, certiCode, treatmentType, applyStatus, pageNum, pageSize);
+                districtCity, districtArea, realName, certiCode, dataFrom, srvOrganId, pageNum, pageSize);
         return Result.success(iPage.getRecords());
     }
 

apply/apply-service/src/main/java/com/hungraim/ism/dao/DisableApplyHisMapper.java

@@ -25,10 +25,12 @@ public interface DisableApplyHisMapper extends BaseMapper<ChDisableApplyHis> {
      * @param area       区
      * @param name       参保人员姓名
      * @param certiCode  参保人身份证号码
-     * @param treatmentType 待遇类型
-     * @param applyStatus   审核状态
+     * @param dataFrom   申请来源
+     * @param srvOrganId 护理机构
      */
-    Page<DisableVO> disableList(Page<DisableVO> page, String organId, String provincial, String city, String area, String name, String certiCode, String treatmentType, String applyStatus);
+    Page<DisableVO> disableList(Page<DisableVO> page, String organId, String provincial,
+                                String city, String area, String name, String certiCode,
+                                String dataFrom, String srvOrganId);
 
     ApplicationManagementInfoVO selectApplicationManagementInfoById(String id);
 }

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

@@ -19,12 +19,16 @@ public interface DisableService {
      * @param districtProvincial 所在省
      * @param districtCity       所在市
      * @param districtArea       所在区域
-     * @param realName           参保人员姓名
-     * @param certiCode          参保人身份证号码
-     * @param treatmentType      待遇类型
-     * @param applyStatus        审核状态
+     * @param realName           失能人员姓名
+     * @param certiCode          失能人员身份证号码
+     * @param dataFrom           申请来源
+     * @param srvOrganId         护理机构
+     * @param pageNum            当前页
+     * @param pageSize           每页几条数据
      * @return list
      */
-    Page<DisableVO> disableList(String organId, String districtProvincial, String districtCity, String districtArea, String realName, String certiCode, String treatmentType, String applyStatus, int page, int pageSize);
+    Page<DisableVO> disableList(String organId, String districtProvincial, String districtCity,
+                                String districtArea, String realName, String certiCode, String dataFrom,
+                                String srvOrganId, int pageNum, int pageSize);
 
 }

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

@@ -15,9 +15,10 @@ public class DisableServiceImpl implements DisableService {
 
     @Override
     public Page<DisableVO> disableList(String organId, String districtProvincial, String districtCity,
-                                                     String districtArea, String realName, String certiCode, String treatmentType,
-                                                     String applyStatus, int page, int pageSize) {
-        return disableApplyHisMapper.disableList(new Page(page, pageSize), organId, districtProvincial, districtCity, districtArea, realName, certiCode, treatmentType, applyStatus);
+                                       String districtArea, String realName, String certiCode, String dataFrom,
+                                       String srvOrganId, int page, int pageSize) {
+        return disableApplyHisMapper.disableList(new Page(page, pageSize), organId, districtProvincial,
+                districtCity, districtArea, realName, certiCode, dataFrom, srvOrganId);
     }
 
 }
\ No newline at end of file

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

@@ -155,12 +155,19 @@
         h.CERTI_CODE certiCode,
         h.TREATMENT_TYPE treatmentTyte,
         h.OPER_NAME operName,
+        h.gender gender,
         h.OPER_CERTI_CODE operCertiCode,
-        h.TEL tel,
-        h.ADRESS_DISTRICT_CODE aderssDistrictCode,
+        h.fixed_tel fixedTel,
+        h.srv_mode_id srvModeId,
+        h.disease disease,
+        h.eff_time effTime,
+        h.data_from dataFrom,
         h.ADRESS_DETAIL adressDetail
         from CH_DISABLE_APPLY_HIS h,CH_APR_ORGAN o
-        where h.organ_id = #{organId}
+        where h.organ_id = o.organ_code
+        <if test="provincial != null and city != null and area != null">
+            and h.organ_id = #{organId}
+        </if>
         <if test="provincial != null and city != null and area != null">
             and h.DISTRICT_PROVINCIAL = #{provincial}
             and h.DISTRICT_CITY = #{city}
@@ -172,15 +179,14 @@
         <if test="certiCode != null">
             and h.CERTI_CODE = #{certiCode}
         </if>
-        <if test="treatmentType != null">
-            and h.TREATMENT_TYPE = #{treatmentType}
+        <if test="dataFrom != null">
+            and h.DATA_FROM = #{dataFrom}
         </if>
-        <if test="applyStatus != null">
-            and h.APPLY_STATUS = #{applyStatus}
+        <if test="srvOrganId != null">
+            and h.srvOrganId = #{srvOrganId}
         </if>
-        and h.organ_id = o.organ_code
     </select>
-    <select id="selectApplicationManagementInfoByIdno" resultType="com.hungraim.ism.pojo.vo.disable.DisableVO">
+    <select id="selectApplicationManagementInfoById" resultType="com.hungraim.ism.pojo.vo.disable.ApplicationManagementInfoVO">
         select h.DISTRICT_PROVINCIAL provincial,
                h.DISTRICT_CITY       city,
                h.DISTRICT_AREA       area,

common/common-core/src/main/java/com/hungraim/ism/pojo/vo/disable/DisableVO.java

@@ -14,20 +14,29 @@ public class DisableVO {
     private String provincial;
     private String city;
     private String area;
-    //参保人姓名
+    //失能人员姓名
     private String name;
-    //参保人身份证号码
+    //失能人员身份证号码
     private String certiCode;
     //待遇类型
     private String treatmentTyte;
     //联系人姓名
     private String operName;
-    //联系人身份证号码
+    //年龄
+    //性别
+    private String gender;
+    //失能人员身份证号码
     private String operCertiCode;
-    //申请人电话
-    private String tel;
-    //居住地址
-    private String aderssDistrictCode;
+    //失能人员联系方式
+    private String fixedTel;
+    //申请服务方式
+    private String srvModeId;
+    //诊断疾病
+    private String disease;
+    //申请时间
+    private String effTime;
+    //申请来源
+    private String dataFrom;
     //审核状态
     private String adressDetail;
 
@@ -119,27 +128,59 @@ public class DisableVO {
         this.operCertiCode = operCertiCode;
     }
 
-    public String getTel() {
-        return tel;
+    public String getAdressDetail() {
+        return adressDetail;
     }
 
-    public void setTel(String tel) {
-        this.tel = tel;
+    public void setAdressDetail(String adressDetail) {
+        this.adressDetail = adressDetail;
     }
 
-    public String getAderssDistrictCode() {
-        return aderssDistrictCode;
+    public String getGender() {
+        return gender;
     }
 
-    public void setAderssDistrictCode(String aderssDistrictCode) {
-        this.aderssDistrictCode = aderssDistrictCode;
+    public void setGender(String gender) {
+        this.gender = gender;
     }
 
-    public String getAdressDetail() {
-        return adressDetail;
+    public String getFixedTel() {
+        return fixedTel;
     }
 
-    public void setAdressDetail(String adressDetail) {
-        this.adressDetail = adressDetail;
+    public void setFixedTel(String fixedTel) {
+        this.fixedTel = fixedTel;
+    }
+
+    public String getSrvModeId() {
+        return srvModeId;
+    }
+
+    public void setSrvModeId(String srvModeId) {
+        this.srvModeId = srvModeId;
+    }
+
+    public String getDisease() {
+        return disease;
+    }
+
+    public void setDisease(String disease) {
+        this.disease = disease;
+    }
+
+    public String getEffTime() {
+        return effTime;
+    }
+
+    public void setEffTime(String effTime) {
+        this.effTime = effTime;
+    }
+
+    public String getDataFrom() {
+        return dataFrom;
+    }
+
+    public void setDataFrom(String dataFrom) {
+        this.dataFrom = dataFrom;
     }
 }