ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java
@@ -246,4 +246,14 @@ } } } /** * 处理患者信息，进入子任务表 */ @ApiOperation("addOperationSubTask") @PostMapping("/addOperationSubTask") public void addOperationSubTask() { String config = configService.selectConfigByKey("visit.early.day"); iPatMedInhospService.addOperationSubTask(config); } } ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java
@@ -381,7 +381,7 @@ PatMedOperationItem patMedOperationItem = new PatMedOperationItem(); patMedOperationItem.setOrgid(operation.getOrgid()); if(StringUtils.isNotEmpty(operation.getOpid())){ patMedOperationItem.setOpid(Long.valueOf(operation.getOpid())); patMedOperationItem.setOpid(operation.getOpid()); patMedOperationItem.setLastStartTime(operation.getLastStartTime()); patMedOperationItem.setLastEndTime(operation.getLastEndTime()); List<PatMedOperationItem> patMedOperationItems = chMapper.selectOperItemList(patMedOperationItem); ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
@@ -934,10 +934,10 @@ AND oi.opid = #{opid} </if> <if test="lastStartTime != null and lastStartTime != ''"> and last_Update_Time >= to_date(#{lastStartTime}, 'YYYY-MM-DD HH24:MI:SS') and oi.last_Update_Time >= to_date(#{lastStartTime}, 'YYYY-MM-DD HH24:MI:SS') </if> <if test="lastEndTime != null and lastEndTime != ''"> and last_Update_Time <= to_date(#{lastEndTime}, 'YYYY-MM-DD HH24:MI:SS') and oi.last_Update_Time <= to_date(#{lastEndTime}, 'YYYY-MM-DD HH24:MI:SS') </if> </select> </mapper> smartor/src/main/java/com/smartor/domain/BaseDictOperation.java
@@ -32,7 +32,7 @@ */ @ApiModelProperty("his手术id") @Excel(name = "his手术id") private Long opid; private String opid; /** * 手术名称ID smartor/src/main/java/com/smartor/domain/PatMedOperationItem.java
@@ -39,7 +39,7 @@ */ @ApiModelProperty("手术id") @Excel(name = "手术id") private Long opid; private String opid; /** * 手术名称ID smartor/src/main/java/com/smartor/domain/ServiceTaskoper.java
@@ -57,7 +57,7 @@ */ @ApiModelProperty("手术id") @Excel(name = "手术id") private Long opid; private String opid; /** * 手术编码 smartor/src/main/java/com/smartor/service/IPatMedInhospService.java
@@ -115,4 +115,12 @@ * @return */ public List<PatMedInhosp> getDocAndPat(PatMedInhosp patMedInhosp); /** * 处理从his取来的手术信息 * * @param * @return 结果 */ public void addOperationSubTask(String config); } smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -788,9 +788,14 @@ if (Objects.isNull(patMedOperationItem.getOplevelcode())) { return; } PatMedOperation patMedOperation = patMedOperationMapper.selectPatMedOperationById(patMedOperationItem.getOpid()); if (Objects.isNull(patMedOperation)) { PatMedOperation patMedOperationVo = new PatMedOperation(); PatMedOperation patMedOperation = new PatMedOperation(); patMedOperationVo.setOpid(patMedOperationItem.getOpid()); List<PatMedOperation> patMedOperationList = patMedOperationMapper.selectPatMedOperationList(patMedOperationVo); if (CollectionUtils.isEmpty(patMedOperationList)) { return; }else { patMedOperation = patMedOperationList.get(0); } PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patMedOperation.getPatid()); if (Objects.isNull(patArchive)) { @@ -1167,7 +1172,8 @@ } } private void addOperationSubTask(String config) { @Override public void addOperationSubTask(String config) { // 手术随访 PatMedOperationItem pmoi = new PatMedOperationItem(); //获取需要出院疾病随访，未处理的数据 smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
@@ -1423,7 +1423,7 @@ Boolean addMianTableFalg = true; for (ExternalOperationDetail externalOperationDetail : externalOperationDetails) { PatMedOperationItem patMedOperationItem = new PatMedOperationItem(); patMedOperationItem.setOpid(patMedOperation.getId()); patMedOperationItem.setOpid(patMedOperation.getOpid()); patMedOperationItem.setOpcode(externalOperationDetail.getShouShuMCID()); patMedOperationItem.setOpdesc(externalOperationDetail.getShouShuMC()); patMedOperationItem.setMainFlag(externalOperationDetail.getZhuShouSBZ());
