代码修改

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

@@ -49,6 +49,7 @@ public class ImUtil {
        Rehabilitation("康复计划发送", "20"),
        Reservation("转诊预约发送", "21"),
        Know("已知悉", "22"),
        Hospitalization("住院登记申请", "50"),
        KnowCommonQuestion("知识库-常见问题", "3001"),
        KnowCommonCustomer("知识库-客服欢迎", "3008"),
        KnowCommonQuestions("知识库-常见问题集", "3002"),

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/prescription/WlyyOutpatientHospitalizationDO.java

@@ -1,14 +1,9 @@
package com.yihu.jw.entity.hospital.prescription;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntityWithCreateTime;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
@@ -28,7 +23,7 @@ public class WlyyOutpatientHospitalizationDO extends UuidIdentityEntityWithOpera
    private String diagnosisCode;//入院诊断代码
    private String diagnosisName;//入院诊断代码名称
    private Integer admissionType;//入院方式，0-门诊 1-急诊 2-转入 5-留观
    private Integer admissionCondition;//院病情，1-病危 2-专科紧急  3-一般  4-急诊 5-专科限期  6-专科普通
    private Integer admissionCondition;//入院病情，1-病危 2-专科紧急  3-一般  4-急诊 5-专科限期  6-专科普通
    private Integer admissionCause;//住院目的，0-治疗 1-分娩 2-身体检查 3-计划生育
    private Integer trumFlag;//是否外伤 0-否 1-是
    private Integer relTtpFlag;//外伤是否涉及第三方 0-否 1-是

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/prescription/PrescriptionEndpoint.java

@@ -260,7 +260,7 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
        try {
            WlyyOutpatientVO obj = new WlyyOutpatientVO();
            if (wxId.equalsIgnoreCase("xm_zsyy_wx")) {
            if (wxId.equalsIgnoreCase("xm_zsyy_wx")||demoFlag) {
                obj = prescriptionService.findOutpatientInfo(patient, conNo);
            } else if (wxId.equalsIgnoreCase("sd_tnzyy_wx")) {
                obj = tnPrescriptionService.findOutpatientInfo(patient, conNo, demoFlag, null);
@@ -363,13 +363,15 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
                                                                               @RequestParam(value = "endTime", required = false) String endTime,
                                                                               @ApiParam(name = "outpatientType", value = "1复诊2协同3咨询4康复咨询")
                                                                               @RequestParam(value = "outpatientType", required = false) String outpatientType,
                                                                               @ApiParam(name = "type", value = "outpatientType=1时 type 1=住院申请")
                                                                               @RequestParam(value = "type", required = false) String type,
                                                                               @ApiParam(name = "page", value = "第几页，1开始’")
                                                                               @RequestParam(value = "page", required = false) Integer page,
                                                                               @ApiParam(name = "size", value = "每页大小")
                                                                               @RequestParam(value = "size", required = true) Integer size) {
        try {
            return prescriptionService.findReOutpatientList(patient, status, startTime, endTime, outpatientType, page, size);
            return prescriptionService.findReOutpatientList(patient, status, startTime, endTime, outpatientType, page, size,type);
        } catch (Exception e) {
            return failedMixEnvelopException(e);
        }
@@ -640,7 +642,7 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
    @ApiOperation(value = "获取ICD10诊断编码", notes = "获取ICD10诊断编码")
    public ListEnvelop getICD10(@ApiParam(name = "pyKey", value = "拼音关键字")
                                @RequestParam(value = "pyKey", required = false) String pyKey) throws Exception {
        if (wxId.equalsIgnoreCase("xm_zsyy_wx")) {
        if (wxId.equalsIgnoreCase("xm_zsyy_wx")||demoFlag) {
            return success(prescriptionService.getICD10(pyKey));
        } else if (wxId.equalsIgnoreCase("xm_xzzx_wx")) {
            return success(xzzxEntranceService.selectIcd10Dict(pyKey));
@@ -3794,16 +3796,28 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
    @PostMapping("/applyHospital")
    @ApiOperation(value = "住院登记申请", notes = "住院登记申请")
    public Envelop applyHospital(
            @ApiParam(name = "json", value = "住院登记实体类json", required = false)
            @RequestParam(value = "json",required = false)String json) {
            @ApiParam(name = "json", value = "住院登记实体类json", required = true)
            @RequestParam(value = "json",required = true)String json,
            @ApiParam(name = "session_id", value = "会话id", required = true)
            @RequestParam(value = "session_id",required = true)String session_id) {
        try {
            WlyyOutpatientHospitalizationDO hospitalizationDO = toEntity(json,WlyyOutpatientHospitalizationDO.class);
            return success("操作成功", prescriptionService.applyHospital(hospitalizationDO));
            hospitalizationDO =  prescriptionService.applyHospital(hospitalizationDO);
            //发送im
            JSONObject jsonObject = new JSONObject();
            jsonObject.put("id",hospitalizationDO.getId());
            jsonObject.put("outpatientId",hospitalizationDO.getOutpatientId());//复诊id
            jsonObject.put("diagnosisCode",hospitalizationDO.getDiagnosisCode());//诊断代码
            jsonObject.put("diagnosisName",hospitalizationDO.getDiagnosisName());//诊断名称
            jsonObject.put("admissionCondition",hospitalizationDO.getAdmissionCondition());//入院病情
            imUtil.sendImMsg(hospitalizationDO.getDoctor(), hospitalizationDO.getDoctorName(), session_id, "50", jsonObject.toString(), "1", null);
            return success("操作成功",hospitalizationDO);
        } catch (Exception e) {
            return Envelop.getError(e.getMessage());
        }
    }
    @PostMapping("/selectHospitalizationByOutpatientId")
    @ApiOperation(value = "查询申请记录", notes = "查询申请记录")
    public Envelop selectHospitalizationByOutpatientId(