ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
@@ -13,6 +13,8 @@ import com.ruoyi.common.utils.PageUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.smartor.domain.*; import com.smartor.mapper.PatMedInhospMapper; import com.smartor.mapper.PatMedOuthospMapper; import com.smartor.service.IServiceSubtaskRecordService; import com.smartor.service.IServiceSubtaskService; import io.swagger.annotations.Api; smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
@@ -566,4 +566,12 @@ @ApiModelProperty(value = "患者来源：0本地患者表 1外部患者表") private String patfrom; @ApiModelProperty(value = "出院、门诊操作人") private String hospOperator; @ApiModelProperty(value = "出院、门诊操作人ID") private String hospOperatorId; } smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -255,7 +255,7 @@ // 根据患者的疾病，获取该疾病的长期任务 ServiceTaskdiag serviceTaskdiag = new ServiceTaskdiag(); serviceTaskdiag.setLongtask(1L); serviceTaskdiag.setIcd10code(patMedInhosp1.getLeaveldeptcode()); serviceTaskdiag.setIcd10code(patMedInhosp1.getLeaveicd10code()); List<ServiceTaskdiag> serviceTaskdiags = serviceTaskdiagMapper.selectServiceTaskdiagList(serviceTaskdiag); //如果部门模板为空（将deptIsNull设置为true） if (CollectionUtils.isEmpty(serviceTaskdiags) || serviceTaskdiags.size() == 0) { smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
@@ -444,8 +444,8 @@ info.setIcd10((String) map.get("Icd10")); return info; }).collect(Collectors.toList()); patMedInhosp1.setLeaveicd10code(StringUtils.isNotEmpty(patMedInhosp1.getLeaveicd10code()) ? patMedInhosp1.getLeaveicd10code() + "," + hospPatientDiagnoseInfos2.get(0).getIcd10() : hospPatientDiagnoseInfos2.get(0).getIcd10()); patMedInhosp1.setLeavediagname(StringUtils.isNotEmpty(patMedInhosp1.getLeavediagname()) ? patMedInhosp1.getLeavediagname() + "," + hospPatientDiagnoseInfos2.get(0).getZhenDuanMC() : hospPatientDiagnoseInfos2.get(0).getZhenDuanMC()); patMedInhosp1.setLeaveicd10code(hospPatientDiagnoseInfos2.get(0).getIcd10()); patMedInhosp1.setLeavediagname(hospPatientDiagnoseInfos2.get(0).getZhenDuanMC()); patMedInhosp1.setDiagname(StringUtils.isNotEmpty(patMedInhosp1.getLeavediagname()) ? patMedInhosp1.getLeavediagname() + "," + hospPatientDiagnoseInfos2.get(0).getZhenDuanMC() : hospPatientDiagnoseInfos2.get(0).getZhenDuanMC()); //patMedInhosp1.setLeavediagname(StringUtils.isNotEmpty(patMedInhosp1.getLeavediagname()) ? patMedInhosp1.getLeavediagname() : hospPatientDiagnoseInfos2.get(0).getZhenDuanMC()); //patMedInhosp1.setDiagname(StringUtils.isNotEmpty(patMedInhosp1.getLeavediagname()) ? patMedInhosp1.getLeavediagname() : hospPatientDiagnoseInfos2.get(0).getZhenDuanMC()); smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java
@@ -304,8 +304,12 @@ throw new BaseException("360查询条件为空"); } String token = null; LyraTokenUtil lyraTokenUtil = null; if (serviceQueryInfo.getXiaoXiTou().getFaSongJGID().equals("47255004333112711A1001")) //景宁 lyraTokenUtil = LyraTokenUtil.createLyraTokenUtil("https://9.0.124.104:13021/mediinfo-lyra-authserver/connect/token", "zjhes.suifangxt", "OIjdJvx2ALjFVGZoCZO4I8O"); if (serviceQueryInfo.getXiaoXiTou().getFaSongJGID().equals("47231022633110211A2101")) //中医院 lyraTokenUtil = LyraTokenUtil.createLyraTokenUtil("https://9.0.124.104:13011/mediinfo-lyra-authserver/connect/token", "zjhes.suifangxt", "OIjdJvx2ALjFVGZoCZO4I8O"); LyraTokenUtil lyraTokenUtil = LyraTokenUtil.createLyraTokenUtil("https://9.0.124.104:13021/mediinfo-lyra-authserver/connect/token", "zjhes.suifangxt", "OIjdJvx2ALjFVGZoCZO4I8O"); try { token = lyraTokenUtil.getToken(); } catch (IOException e) { @@ -337,7 +341,10 @@ try { String jsonString = objectMapper.writeValueAsString(serviceQueryInfo); log.error("token的值为：{}", token); if (serviceQueryInfo.getXiaoXiTou().getFaSongJGID().equals("47255004333112711A1001")) //景宁 result = OkHttpExample.sendPostRequest("https://9.0.124.104:13021/mediinfo-grus-fuwuzxwg/api/esb/lyraSyncRun", jsonString, token); if (serviceQueryInfo.getXiaoXiTou().getFaSongJGID().equals("47231022633110211A2101")) //中医院 result = OkHttpExample.sendPostRequest("https://9.0.124.104:13011/mediinfo-grus-fuwuzxwg/api/esb/lyraSyncRun", jsonString, token); map = objectMapper.readValue(result, Map.class); } catch (Exception e) { e.printStackTrace();
