代码修改

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionService.java

@@ -1175,6 +1175,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                if(!org.springframework.util.StringUtils.isEmpty(serviceItemPlanDO.getRelationCode())){
                    throw new RuntimeException("该计划已发起过咨询，请选择其他计划发起！");
                }
                serviceItemPlanDO.setStatus("3");
                serviceItemPlanDO.setRelationCode(outpatient.getId());
                serviceItemPlanDao.save(serviceItemPlanDO);
            }

business/im-service/src/main/java/com/yihu/jw/im/service/ImService.java

@@ -1831,6 +1831,17 @@ public class ImService {
                }
                outpatientDao.save(wlyyOutpatientDO);
                //结束康复执行计划
                ServiceItemPlanDO serviceItemPlanDO = serviceItemPlanDao.findById(wlyyOutpatientDO.getPlanId()).orElse(null);
                if(serviceItemPlanDO!=null){
                    if(!org.springframework.util.StringUtils.isEmpty(serviceItemPlanDO.getRelationCode())){
                        throw new RuntimeException("该计划已发起过咨询，请选择其他计划发起！");
                    }
                    serviceItemPlanDO.setStatus("1");
                    serviceItemPlanDO.setCompleteTime(DateUtil.getStringDate());
                    serviceItemPlanDao.save(serviceItemPlanDO);
                    updPlanStatus(serviceItemPlanDO.getPlanId(),serviceItemPlanDO.getPlanDetailId());
                }
            }
            List<WlyyHospitalWaitingRoomDO> wlyyHospitalWaitingRoomDOS = hospitalWaitingRoomDao.findByOutpatientId(cons.getRelationCode());
@@ -1870,6 +1881,23 @@ public class ImService {
        return 1;
    }
    //康复计划状态更新
    public void updPlanStatus(String planId, String planDetailId) {
        List<ServiceItemPlanDO> itemPlanDOS = serviceItemPlanDao.findByPlanDetailId(planDetailId, "0");
        if (itemPlanDOS.size() > 0) {
            //服务项计划都完成了
            jdbcTemplate.update("update wlyy_rehabilitation_plan_detail set status=1 where id='" + planDetailId + "'");
            String sql = "SELECT COUNT(*) total,COUNT(if(`status`=1,1,null)) num from wlyy_rehabilitation_plan_detail  " +
                    "WHERE plan_id='" + planId + "'";
            List<Map<String, Object>> list = jdbcTemplate.queryForList(sql);
            String total = list.get(0).get("total") + "";
            String num = list.get(0).get("num") + "";
            if (total.equals(num)) {
                jdbcTemplate.update("update wlyy_patient_rehabilitation_plan set status=2 where id='" + planId + "'");
            }
        }
    }
    /**
     * 居民取消复诊
     *

common/common-entity/src/db/2024.sql

@@ -1,2 +1,11 @@
ALTER table wlyy_outpatient add COLUMN `plan_id` varchar(50) DEFAULT NULL COMMENT '康复执行计划关联id';
ALTER table wlyy_outpatient add COLUMN `plan_doctor` varchar(50) DEFAULT NULL COMMENT '康复执行计划负责人id';
ALTER table wlyy_outpatient add COLUMN `plan_doctor` varchar(50) DEFAULT NULL COMMENT '康复执行计划负责人id';
--中山医院那套有就不加了 ALTER table base_suggestion add COLUMN `suggest_user_idcard` varchar(50) DEFAULT NULL COMMENT '投诉人身份证';
-- ALTER table base_suggestion add COLUMN `user_idcard_front` varchar(255) DEFAULT NULL COMMENT '投诉人身份证正面url';
-- ALTER table base_suggestion add COLUMN `user_idcard_bak` varchar(255) DEFAULT NULL COMMENT '投诉人身份证反面url';
-- ALTER table base_suggestion add COLUMN `vitist_type` varchar(50) DEFAULT NULL COMMENT '就诊类型 1门诊 2住院';
-- ALTER table base_suggestion add COLUMN `vitist_time` varchar(50) DEFAULT NULL COMMENT '就诊时间';
-- ALTER table base_suggestion add COLUMN `vitist_dept_code` varchar(50) DEFAULT NULL COMMENT '就诊科室编码';
-- ALTER table base_suggestion add COLUMN `vitist_detp_name` varchar(50) DEFAULT NULL COMMENT '就诊科室名称';
-- ALTER table base_suggestion add COLUMN `admission_no` varchar(50) DEFAULT NULL COMMENT '住院号';

common/common-entity/src/main/java/com/yihu/jw/entity/base/complaint/BaseComplaintDO.java

@@ -2,7 +2,6 @@ package com.yihu.jw.entity.base.complaint;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -10,32 +9,36 @@ import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.Date;
/**
 * 投诉反馈，中山和73医院
 */
@Entity
@Table(name = "base_complaint")
public class BaseComplaintDO  extends UuidIdentityEntity {
    private String complaintId;
    private String complaintName;
    private String complaintContent;
    private String visitType;
    private String complaintId;//'投诉类型id'
    private String complaintName;//'投诉类型名称'
    private String complaintContent;//'投诉内容'
    private String visitType;//'就诊类型1门诊2住院'
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    private Date visitTime;
    private String visitDept;
    private String visitDeptName;
    private String admNo;
    private String patient;
    private String patientName;
    private String patientIdcard;
    private String idcardFront;
    private String idcardBack;
    private String imgUrl;
    private String isDel;
    private String status;
    private String mobile;
    private String visitTypeName;
    private Date visitTime;//'就诊时间'
    private String visitDept;//'就诊科室'
    private String visitDeptName;//'就诊科室名称'
    private String admNo;//'住院号'
    private String patient;//'投诉人id'
    private String patientName;//'投诉人姓名'
    private String patientIdcard;//'投诉人身份证号'
    private String idcardFront;//'身份证正面地址'
    private String idcardBack;//'身份证背面地址'
    private String imgUrl;//'投诉图片地址多个逗号隔开'
    private String isDel;//'0删除1正常'
    private String status;//'0已投诉1已接收2已反馈'
    private String mobile;//
    private String visitTypeName;//
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    private Date latestFeedTime;
    private String passto;
    private String defaultdoctor;
    private Date latestFeedTime;//
    private String passto;//
    private String defaultdoctor;//
    @Column(name = "defaultdoctor")
    public String getDefaultdoctor() {
        return defaultdoctor;
@@ -45,9 +48,6 @@ public class BaseComplaintDO  extends UuidIdentityEntity {
        this.defaultdoctor = defaultdoctor;
    }
    @Column(name = "passto")
    public String getPassto() {
        return passto;
@@ -80,25 +80,24 @@ public class BaseComplaintDO  extends UuidIdentityEntity {
        return mobile;
    }
    public void setMobile(String mobile) {
        this.mobile = mobile;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    private Date createTime;
    private Date createTime;//'创建时间'
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    private Date acceptTime;
    private Date acceptTime;//'接收时间'
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    private Date dealTime;
    private String operator;
    private String operatorName;
    private String operatorDept;
    private String operatorDeptName;
    private String feedBack;
    private String feedImg;
    private String acceptor;
    private String acceptorName;
    private Date dealTime;//'处理时间'
    private String operator;//'操作人'
    private String operatorName;//'操作人姓名'
    private String operatorDept;//'操作人科室'
    private String operatorDeptName;//'操作人科室名称'
    private String feedBack;//'反馈内容'
    private String feedImg;//'反馈图片地址'
    private String acceptor;//'接收人'
    private String acceptorName;//'接收人名称'
    @Column(name = "operator_dept")
    public String getOperatorDept() {
        return operatorDept;

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/suggest/BaseSuggestionDO.java

@@ -8,6 +8,7 @@ import javax.persistence.Table;
import javax.persistence.Transient;
/**
 * 意见反馈
 * Created by wj on 2020/0811.
 */
@Entity