Merge remote-tracking branch 'origin/master'

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

@@ -148,6 +148,18 @@ public class DisableController {
     }
 
     /**
+     * 修改失能申请
+     */
+    @RequestMapping("/updateDisable")
+    public Result updateDisable(ChDisableApply chDisableApply) {
+        if (chDisableApply.getApplyId() == null) {
+            return Result.failed("请求参数错误");
+        }
+        disableService.updateDisable(chDisableApply);
+        return Result.success();
+    }
+
+    /**
      * 新增失能申请
      */
     @RequestMapping("/addDisable")

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

+package com.hungraim.ism.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hungraim.ltc.pojo.entity.disable.ChDisableApplyHis;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Repository
+@Mapper
+public interface DisableApplyHisMapper extends BaseMapper<ChDisableApplyHis> {
+}

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

@@ -39,5 +39,5 @@ public interface DisableApplyMapper extends BaseMapper<ChDisableApply> {
 
     DisableExamineInfoVO selectDisableExamineInfoByApplyId(String applyId);
 
-    List<ExamineRecord> listExamineRecordByApplyId(String applyHisId);
+    List<ExamineRecord> listExamineRecordByApplyId(String applyId);
 }

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

@@ -84,4 +84,6 @@ public interface DisableService {
      * @return 机构及所有子机构id,以逗号分隔,如果没有子机构则只返回机构id
      */
     String subsidiariesOrganId(String organId);
+
+    void updateDisable(ChDisableApply chDisableApply);
 }

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

@@ -10,11 +10,13 @@ import com.hungraim.ism.pojo.vo.disable.ExamineRecord;
 import com.hungraim.ism.service.DisableService;
 import com.hungraim.ltc.pojo.entity.disable.*;
 import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 
 @Service
@@ -34,6 +36,8 @@ public class DisableServiceImpl implements DisableService {
     private SrvOrganMapper srvOrganMapper;
     @Autowired
     private FndDiseaseTypeMapper fndDiseaseTypeMapper;
+    @Autowired
+    private DisableApplyHisMapper disableApplyHisMapper;
 
     /**
      * 获取机构ids
@@ -87,9 +91,22 @@ public class DisableServiceImpl implements DisableService {
     @Override
     public void disableExamine(String applyId, String checkName, Short applyStatus, String checkRemark) {
         ChDisableApply chDisableApply = disableApplyMapper.selectById(applyId);
-        chDisableApply.setCheckName(checkName);
-        chDisableApply.setApplyStatus(applyStatus);
-        chDisableApply.setCheckRemark(checkRemark);
+        Date date = new Date();
+        ChDisableApplyHis chDisableApplyHis = new ChDisableApplyHis();
+        BeanUtils.copyProperties(chDisableApply, chDisableApplyHis);
+        chDisableApplyHis.setCheckName(checkName);
+        chDisableApplyHis.setApplyStatus(applyStatus);
+        chDisableApplyHis.setCheckRemark(checkRemark);
+        chDisableApplyHis.setCheckTime(date);
+        if (applyStatus.equals(Short.valueOf("2"))) {
+            // 审核通过
+            chDisableApply.setCheckName(checkName);
+            chDisableApply.setApplyStatus(applyStatus);
+            chDisableApply.setCheckRemark(checkRemark);
+            chDisableApply.setCheckTime(date);
+            disableApplyMapper.updateById(chDisableApply);
+        }
+        disableApplyHisMapper.insert(chDisableApplyHis);
     }
 
     @Override
@@ -168,4 +185,8 @@ public class DisableServiceImpl implements DisableService {
         return sb.toString();
     }
 
+    @Override
+    public void updateDisable(ChDisableApply chDisableApply) {
+        disableApplyMapper.updateById(chDisableApply);
+    }
 }
\ No newline at end of file

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

@@ -59,7 +59,8 @@
     </select>
 
     <select id="selectDisableExamineInfoByApplyId" resultType="com.hungraim.ism.pojo.vo.disable.DisableExamineInfoVO">
-        select a.organ_id                                                                   organId,
+        select a.APPLY_ID                                                                   applyId,
+               a.organ_id                                                                   organId,
                a.DISTRICT_PROVINCIAL                                                        districtProvincial,
                a.DISTRICT_CITY                                                              districtCity,
                a.DISTRICT_AREA                                                              districtArea,
@@ -81,11 +82,13 @@
                a.ACPT_SRV_AREA                                                              acptSrvArea,
                a.ACPT_SRV_STREET                                                            acptSrvStreet,
                a.ACPT_SRV_ADDRESS                                                           acptSrvAddress,
+               a.ACPT_SRV_TYPE                                                              acptSrvType,
                a.ADRESS_DISTRICT_PROVINCIAL                                                 adressDistrictProvincial,
                a.ADRESS_DISTRICT_CITY                                                       adressDistrictCity,
                a.ADRESS_DISTRICT_CODE                                                       adressDistrictCode,
                a.STREET                                                                     street,
                a.ADRESS_DETAIL                                                              adressDetail,
+               a.ADDRESS_TYPE                                                               addressType,
 
                a.DISE_TYPE_F                                                                diseTypeF,
                a.DISE_TYPE_S                                                                diseTypeS,
@@ -117,12 +120,12 @@
 
     <select id="listExamineRecordByApplyId" resultType="com.hungraim.ism.pojo.vo.disable.ExamineRecord">
         select CHECK_TIME     checkTime,
-               TREATMENT_TYPE city,
+               TREATMENT_TYPE teratmentType,
                APPLY_STATUS   status,
                CHECK_NAME     name,
-               CHECK_REMARK   certiCode
+               CHECK_REMARK   remark
         from CH_DISABLE_APPLY_HIS
-        where APPLY_ID = #{applyHisId}
+        where APPLY_ID = #{applyId}
     </select>
 
 </mapper>
\ No newline at end of file

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

@@ -10,6 +10,8 @@ import java.util.List;
  */
 @Data
 public class DisableExamineInfoVO {
+    // 失能人员id
+    private Long applyId;
     //***失能人员个人信息
     //机构
     private String organId;
@@ -46,12 +48,16 @@ public class DisableExamineInfoVO {
     private String acptSrvArea;
     private String acptSrvStreet;
     private String acptSrvAddress;
+    //接受服务地址类型(现在址：0,护理机构地址：1,其他：2,接受评定地址：3)
+    private Short acptSrvType;
     //现住址
     private String adressDistrictProvincial;
     private String adressDistrictCity;
     private String adressDistrictCode;
     private String street;
     private String adressDetail;
+    //现住址类型(0：接受评定地址；1：接受服务地址；2：其他)
+    private Short addressType;
 
     //***失能人员医疗及失能信息
     //诊断疾病

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

 package com.hungraim.ism.pojo.vo.disable;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
 import java.util.Date;
 
+@Data
 public class ExamineRecord {
     //审核时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date checkTime;
     //申请类型
-    private String city;
+    private String teratmentType;
     //审核结果
     private String status;
     //审核人
     private String name;
     //备注
-    private String certiCode;
-
-    public Date getCheckTime() {
-        return checkTime;
-    }
-
-    public void setCheckTime(Date checkTime) {
-        this.checkTime = checkTime;
-    }
-
-    public String getCity() {
-        return city;
-    }
-
-    public void setCity(String city) {
-        this.city = city;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getCertiCode() {
-        return certiCode;
-    }
-
-    public void setCertiCode(String certiCode) {
-        this.certiCode = certiCode;
-    }
+    private String remark;
 }

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

@@ -583,16 +583,6 @@ public class ChDisableApply implements Serializable {
     private String medicalHistory;
 
     /**
-     * 历史操作时间
-     */
-    private Date hisTime;
-
-    /**
-     * 历史操作人
-     */
-    private Long hisEmp;
-
-    /**
      * 代办人固话
      */
     private String operFixedTel;

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

 package com.hungraim.ltc.pojo.entity.disable;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
@@ -12,10 +15,12 @@ import java.util.Date;
  */
 @Data
 @TableName("CH_DISABLE_APPLY_HIS")
+@KeySequence(value = "SEQ_CH_DISABLE_APPLY_HIS")
 public class ChDisableApplyHis implements Serializable {
     /**
      * 失能申请历史id
      */
+    @TableId(value = "APPLY_HIS_ID", type = IdType.INPUT)
     private Long applyHisId;
 
     /**