ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java
@@ -388,6 +388,8 @@ log.info("同步手术详情信息数量" + patMedOperationItems.size()); for (PatMedOperationItem operationItem : patMedOperationItems) { try { operationItem.setInhospstate(operation.getInhospstate()); operationItem.setSerialnum(operation.getSerialnum()); PatMedOperationItem operItem = new PatMedOperationItem(); operItem.setOpid(operationItem.getOpid()); operItem.setOperationid(operationItem.getOperationid()); smartor/src/main/java/com/smartor/domain/CommonTaskcallMQ.java
@@ -36,7 +36,7 @@ * 任务发送方式：“电话，短信，公众号，链接...”以逗号分隔 */ @Excel(name = "任务发送方式：1,人工 2,纸质 3,电话 4,短信 5.微信公众号 6.微信小程序 7.支付宝小程序 8.智能机器人 9.钉钉") @ApiModelProperty(value = "务发送方式：1,人工 2,纸质 3,电话 4,短信 5.微信公众号 6.微信小程序 7.支付宝小程序 8.智能机器人 9.钉钉") @ApiModelProperty(value = "任务发送方式：1,人工 2,纸质 3,电话 4,短信 5.微信公众号 6.微信小程序 7.支付宝小程序 8.智能机器人 9.钉钉") private String preachform;
@@ -191,4 +191,9 @@ @ApiModelProperty(value = "短号信息") private String DuanHaoXX; @ApiModelProperty(value = "病人类型代码") private String BingRenLXDM; @ApiModelProperty(value = "病人类型名称") private String BingRenLXMC; } smartor/src/main/java/com/smartor/domain/PatMedOperationItem.java
@@ -250,5 +250,18 @@ */ @ApiModelProperty(value = "出院病区名称") private String leavehospitaldistrictname; /** * 住院标识：0：在院 1：出院 2：转科 3待入院 */ @ApiModelProperty(value = "住院标识： 0：在院 1：出院 2：转科 3待入院") private String inhospstate; /** * 住院记录流水号 */ @ApiModelProperty("住院记录流水号") @Excel(name = "住院记录流水号") private String serialnum; }
@@ -875,6 +875,10 @@ patMedInhosp.setPatid((patMedOperationItem.getPatid())); patMedInhosp.setInhospstate("1"); patMedInhosp.setFuflag("1"); //手术随访 if(!active.equals("hzszlyy")){ patMedInhosp.setSerialnum(patMedOperationItem.getSerialnum()); } List<PatMedInhosp> patMedInhospList = patMedInhospMapper.selectPatMedInhospList(patMedInhosp); if (CollectionUtils.isEmpty(patMedInhospList)) { @@ -1261,6 +1265,7 @@ // 手术随访 PatMedOperationItem pmoi = new PatMedOperationItem(); //获取需要出院疾病随访，未处理的数据 // pmoi.setInhospstate("1"); pmoi.setOpercheckFlag("0"); pmoi.setMainFlag("1");
@@ -1409,6 +1409,7 @@ //丽水无院区，默认值是 1 patMedOperation.setCampusid("1"); patMedOperation.setSerialnum(externalInHospPatientInfo.getJiuZhenYWID()); patMedOperation.setInhospstate(externalInHospPatientInfo.getBingRenLXDM()); patMedOperation.setInhospno(externalInHospPatientInfo.getBingAnHao()); patMedOperation.setHospitalname(externalInHospPatientInfo.getZuZhiJGMC()); patMedOperation.setHospitalcode(externalInHospPatientInfo.getZuZhiJGID()); @@ -1473,6 +1474,8 @@ patMedOperationItem.setOpposition(externalOperationDetail.getShouShuBW()); patMedOperationItem.setDelFlag("0"); patMedOperationItem.setOrgid(patMedOperation.getOrgid()); patMedOperationItem.setInhospstate(patMedOperation.getInhospstate()); patMedOperationItem.setSerialnum(patMedOperation.getSerialnum()); //丽水无院区，默认值是 1 patMedOperationItem.setCampusid("1"); if (externalOperationDetail.getZhuShouSBZ().equals("1") && addMianTableFalg == true) { smartor/src/main/resources/mapper/smartor/PatMedOperationItemMapper.xml
@@ -29,6 +29,8 @@ <result property="pid" column="pid"/> <result property="opercheckFlag" column="opercheck_flag"/> <result property="longTaskReason" column="long_task_reason"/> <result property="inhospstate" column="inhospstate"/> <result property="serialnum" column="serialnum"/> <result property="deptcode" column="deptcode"/> <result property="deptname" column="deptname"/> @@ -46,7 +48,7 @@ </resultMap> <sql id="selectPatMedOperationItemVo"> select id, operationid, opid, opcode, opdesc, main_flag, incitypecode, incitypedesc, oplevelcode, opleveldesc, opposition, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid, pguid, guid, pid, opercheck_flag, long_task_reason select id, operationid, opid, opcode, opdesc, main_flag, incitypecode, incitypedesc, oplevelcode, opleveldesc, opposition, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid, pguid, guid, pid, opercheck_flag, long_task_reason, inhospstate, serialnum from pat_med_operation_item </sql> @@ -101,6 +103,12 @@ </if> <if test="pid != null "> and pid = #{pid} </if> <if test="inhospstate != null and inhospstate != ''"> and inhospstate = #{inhospstate} </if> <if test="serialnum != null and serialnum != ''"> and serialnum = #{serialnum} </if> </select> @@ -159,6 +167,10 @@ </if> <if test="longTaskReason != null">long_task_reason, </if> <if test="inhospstate != null">inhospstate, </if> <if test="serialnum != null">serialnum, </if> </trim> <trim prefix="values (" suffix=")" suffixOverrides=","> <if test="operationid != null">#{operationid}, @@ -206,6 +218,10 @@ <if test="opercheckFlag != null">#{opercheckFlag}, </if> <if test="longTaskReason != null">#{longTaskReason}, </if> <if test="inhospstate != null">#{inhospstate}, </if> <if test="serialnum != null">#{serialnum}, </if> </trim> </insert> @@ -282,6 +298,12 @@ <if test="longTaskReason != null">long_task_reason = #{longTaskReason}, </if> <if test="inhospstate != null">inhospstate = #{inhospstate}, </if> <if test="serialnum != null">serialnum = #{serialnum}, </if> </trim> where id = #{id} </update> @@ -335,6 +357,10 @@ </if> <if test="longTaskReason != null">long_task_reason, </if> <if test="inhospstate != null">inhospstate, </if> <if test="serialnum != null">serialnum, </if> </trim> values <foreach item="item" index="index" collection="list" separator=","> @@ -385,6 +411,10 @@ </if> <if test="longTaskReason != null">#{item.longTaskReason}, </if> <if test="inhospstate != null">#{item.inhospstate}, </if> <if test="serialnum != null">#{item.serialnum}, </if> </trim> </foreach> </insert> @@ -421,7 +451,8 @@ pmoi.pguid, pmoi.guid, pmoi.pid, pmoi.opercheck_flag, pmoi.long_task_reason, pmo.deptcode, pmo.deptname, pmo.hospitaldistrictcode, pmo.hospitaldistrictname, pmo.leaveldeptcode, pmo.leaveldeptname, pmo.leavehospitaldistrictcode, pmo.leavehospitaldistrictname, pmo.patid, pmo.drcode, pmo.drname, pmo.nurse_id, pmo.nurse_name pmo.drcode, pmo.drname, pmo.nurse_id, pmo.nurse_name, pmo.inhospstate, pmo.serialnum from pat_med_operation pmo join pat_med_operation_item pmoi on pmoi.opid = pmo.opid @@ -478,6 +509,12 @@ <if test="pid != null "> and pmoi.pid = #{pid} </if> <if test="inhospstate != null and inhospstate != ''"> and pmo.inhospstate = #{inhospstate} </if> <if test="serialnum != null and serialnum != ''"> and pmo.serialnum = #{serialnum} </if> <if test="deptcode != null and deptcode != ''"> and pmo.deptcode = #{deptcode} </if>
