From 7207500852d186a3a39daf0fa1cdbe89411a5eaf Mon Sep 17 00:00:00 2001 From: zhangchao Date: Wed, 22 May 2024 15:04:59 +0800 Subject: [PATCH] =?UTF-8?q?#fix:=E4=BC=98=E5=8C=96=E5=BC=80=E9=80=9A?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=95=B0=E6=8D=AE=E4=B8=BAnull=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E5=A4=84=E7=90=86=E5=A6=8A=E5=A8=A0?= =?UTF-8?q?=E6=9C=9F=E9=AB=98=E5=8D=B1=E5=9B=A0=E7=B4=A0=E4=B8=8D=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/common/utils/StringUtils.java | 2 +- .../java/com/lyms/platform/common/utils/SystemConfig.java | 2 ++ .../operate/web/controller/PatientServiceController.java | 4 +++- .../operate/web/facade/AntenatalExaminationFacade.java | 8 ++++---- .../lyms/platform/operate/web/facade/ApplyOrderFacade.java | 4 +++- .../platform/operate/web/facade/ApplyScreeningFacade.java | 5 ++++- .../operate/web/facade/BabyBookbuildingFacade.java | 9 +++++++-- .../lyms/platform/operate/web/facade/BabyEarFacade.java | 4 +++- .../platform/operate/web/facade/BasicConfigFacade.java | 1 + .../platform/operate/web/facade/BookbuildingFacade.java | 9 +++++++-- .../platform/operate/web/facade/PatientServiceFacade.java | 14 +++++++++++--- .../operate/web/facade/PatientServiceSysFacade.java | 4 ++-- .../operate/web/worker/BabyBuildSerToPatientSerWorker.java | 10 ++++++++-- .../operate/web/worker/BuildSerToPatientSerWorker.java | 9 +++++++-- 14 files changed, 63 insertions(+), 22 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java b/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java index 9a25592..8ce7c48 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java @@ -170,7 +170,7 @@ public final class StringUtils { } public static boolean isNotEmpty(String str) { - if (str != null && !"".equals(str)) { + if (str != null && !"".equals(str) && !"null".equals(str)) { return true; } return false; diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/SystemConfig.java b/platform-common/src/main/java/com/lyms/platform/common/utils/SystemConfig.java index 02b882e..cf0720c 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/SystemConfig.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/SystemConfig.java @@ -101,5 +101,7 @@ public class SystemConfig { public static final String REDIS_ORGANIZATION="ORGANIZATION"; //组织结构-城市ID public static final String REDIS_ORGANIZATION_CITY="ORGANIZATION_CITY_"; + //妊娠高危 + public static final String REDIS_NEW_HIGH_RISK_PARENT_RENSHEN="REDIS_NEW_HIGH_RISK_PARENT_RENSHEN"; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java index defb501..f87c67f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java @@ -233,7 +233,9 @@ public class PatientServiceController extends BaseController { PatientService ps = new PatientService(); ps.setSerStatus(1); ps.setParentid(patients.getId()); - ps.setCreateUser(bookbuildingDoctor); + if (StringUtils.isNotEmpty(bookbuildingDoctor)){ + ps.setCreateUser(bookbuildingDoctor); + } ps.setCreateDate(new Date()); //1孕妇 2儿童 3 产妇 if (patients.getType()==1){ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index eea9c62..5fa7813 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -4700,7 +4700,7 @@ public class AntenatalExaminationFacade { map.put("organizations", convert()); map.put("cTime", DateUtil.getyyyy_MM_dd(new Date())); if (CollectionUtils.isEmpty(mainBasicConfigList)) { - List basicConfigList = (List) RedisUtils.getObj(SystemConfig.REDIS_NEW_HIGH_RISK_PARENT); + List basicConfigList = (List) RedisUtils.getObj(SystemConfig.REDIS_NEW_HIGH_RISK_PARENT_RENSHEN); if (CollectionUtils.isEmpty(basicConfigList)) { BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); @@ -4708,14 +4708,14 @@ public class AntenatalExaminationFacade { basicConfigQuery.setTypeId("fb43fd5a-b153-4cb9-9180-c46f5612ba43"); //所有数据 basicConfigList = basicConfigService.queryBasicConfig(basicConfigQuery); - RedisUtils.setObj(SystemConfig.REDIS_NEW_HIGH_RISK_PARENT, basicConfigList, 86400); - mainBasicConfigList = (List) RedisUtils.getObj(SystemConfig.REDIS_NEW_HIGH_RISK_BASE); + RedisUtils.setObj(SystemConfig.REDIS_NEW_HIGH_RISK_PARENT_RENSHEN, basicConfigList, 86400); + mainBasicConfigList = (List) RedisUtils.getObj(SystemConfig.REDIS_NEW_HIGH_RISK_PARENT_RENSHEN); if (CollectionUtils.isEmpty(mainBasicConfigList)) { //主节点数据 basicConfigQuery.setTypeId(null); basicConfigQuery.setParentId("fb43fd5a-b153-4cb9-9180-c46f5612ba43"); mainBasicConfigList = basicConfigService.queryBasicConfig(basicConfigQuery); - RedisUtils.setObj(SystemConfig.REDIS_NEW_HIGH_RISK_BASE, mainBasicConfigList, 86400); + RedisUtils.setObj(SystemConfig.REDIS_NEW_HIGH_RISK_PARENT_RENSHEN, mainBasicConfigList, 86400); } } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index fd2a70e..8095bb7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -266,7 +266,9 @@ public class ApplyOrderFacade { patientService.setSerInfos(Arrays.asList(serInfo)); patientService.setPerType(1); - patientService.setCreateUser(String.valueOf(userId)); + if (userId!=null){ + patientService.setCreateUser(String.valueOf(userId)); + } //开通日期与建档日期一致 patientService.setCreateDate(patients.getBookbuildingDate()); patientService.setParentid(id); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyScreeningFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyScreeningFacade.java index 6698a26..4d5384a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyScreeningFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyScreeningFacade.java @@ -211,7 +211,10 @@ public class ApplyScreeningFacade { patientService.setSerInfos(Arrays.asList(serInfo)); patientService.setPerType(1); - patientService.setCreateUser(String.valueOf(userId)); + if (userId!=null){ + patientService.setCreateUser(String.valueOf(userId)); + } + //开通日期与建档日期一致 patientService.setCreateDate(patients.getBookbuildingDate()); patientService.setParentid(id); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 780f2c2..bb73f4d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -1072,7 +1072,9 @@ public class BabyBookbuildingFacade { PatientService patientService = new PatientService(); patientService.setPerType(2); patientService.setSerInfos(request.getSerInfos()); - patientService.setCreateUser(String.valueOf(userId)); + if (userId!=null){ + patientService.setCreateUser(String.valueOf(userId)); + } //开通日期与建档日期一致 patientService.setCreateDate(DateUtil.parseYMD(request.getBuildDate())); patientService.setParentid(model.getId()); @@ -1703,7 +1705,10 @@ public class BabyBookbuildingFacade { PatientService patientService = new PatientService(); patientService.setPerType(2); patientService.setSerInfos(b.getSerInfos()); - patientService.setCreateUser(String.valueOf(userId)); + if (userId!=null){ + patientService.setCreateUser(String.valueOf(userId)); + } + //开通日期与建档日期一致 patientService.setCreateDate(new Date()); patientService.setParentid(b.getId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java index 71c1ae0..42036a5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java @@ -539,7 +539,9 @@ public class BabyEarFacade { PatientService patientService = new PatientService(); patientService.setPerType(2); patientService.setSerInfos(babyEarBase.getSerInfos()); - patientService.setCreateUser(String.valueOf(userId)); + if (userId!=null){ + patientService.setCreateUser(String.valueOf(userId)); + } //开通日期与建档日期一致 patientService.setCreateDate(DateUtil.parseYMD(babyEarBase.getCreateTime())); patientService.setParentid(baby.getId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java index 44e3656..bf382a0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java @@ -114,6 +114,7 @@ public class BasicConfigFacade { basicConfig.setName(basicConfig.getName()+"1"); } }*/ + mainBasicConfigList = (List) RedisUtils.getObj(SystemConfig.REDIS_NEW_HIGH_RISK_BASE); if (CollectionUtils.isEmpty(mainBasicConfigList)) { BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index f7531ed..31c19da 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -479,7 +479,9 @@ public class BookbuildingFacade { PatientService patientService = new PatientService(); patientService.setSerInfos(yunRequest.getSerInfos()); patientService.setPerType(1); - patientService.setCreateUser(String.valueOf(userId)); + if(userId!=null){ + patientService.setCreateUser(String.valueOf(userId)); + } //开通日期与建档日期一致 patientService.setCreateDate(DateUtil.parseYMD(yunRequest.getBookbuildingDate())); patientService.setParentid(p.getId()); @@ -4475,7 +4477,10 @@ public class BookbuildingFacade { serInfos.add(params); patientService.setSerInfos(serInfos); patientService.setPerType(1); - patientService.setCreateUser(patient.getFirstCheckId()); + if (StringUtils.isNotEmpty(patient.getFirstCheckId())){ + patientService.setCreateUser(patient.getFirstCheckId()); + } + //开通日期与建档日期一致 patientService.setCreateDate(patient.getBookbuildingDate()); patientService.setParentid(patient.getId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java index 9b6ed93..62ab9a6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java @@ -459,7 +459,10 @@ public class PatientServiceFacade { PatientService pser = new PatientService(); - pser.setCreateUser(ps.getCreateUser()); + if (StringUtils.isNotEmpty(ps.getCreateUser())){ + pser.setCreateUser(ps.getCreateUser()); + } + pser.setCreateDate(ps.getCreateDate()); pser.setParentid(ps.getParentid()); //设置服务对象类型 服务人类型(1-孕妇、2-儿童 3-产妇) @@ -510,7 +513,9 @@ public class PatientServiceFacade { //服务开通操作时间 pser.setUpdateDate(new Date()); //服务开通操作人 - pser.setUpdateUser(String.valueOf(userId)); + if (userId!=null){ + pser.setUpdateUser(String.valueOf(userId)); + } if (serInfo.containsKey("device") && StringUtils.isNotEmpty(serInfo.get("device"))) { pser.setDevice(Integer.parseInt(serInfo.get("device"))); @@ -803,7 +808,10 @@ public class PatientServiceFacade { PatientService before = patientServiceService.getPatientService(ps.getId()); //开通人为上一次的数据，因为系统端不能修改，但是小程序可以修改 - ps.setCreateUser(before.getCreateUser()); + if (StringUtils.isNotEmpty(before.getCreateUser())){ + ps.setCreateUser(before.getCreateUser()); + } + if (before.getSerStatus() == PatientSerEnums.SerStatusEnums.td.getId()) {//如果上一次是退订状态，重新开通，开通时间为当前时间 ps.setCreateDate(new Date()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java index 553c493..5da56f7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java @@ -98,9 +98,9 @@ public class PatientServiceSysFacade implements SysBaseFacade { if (CollectionUtils.isNotEmpty(patientServices)) {//修改 PatientService ps = patientServices.get(0); //开通医生修改为小程序开通 - ps.setCreateUser(null); + // ps.setCreateUser(""); //操作员修改为小程序开通 - ps.setUpdateUser(null); + //ps.setUpdateUser(""); ps.setPerType(patientService.getPerType()); ps.setSerStatus(patientService.getSerStatus()); ps.setSerCode(patientService.getSerCode()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/BabyBuildSerToPatientSerWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/BabyBuildSerToPatientSerWorker.java index 03ad6ca..a0dd5ac 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/BabyBuildSerToPatientSerWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/BabyBuildSerToPatientSerWorker.java @@ -133,7 +133,10 @@ public class BabyBuildSerToPatientSerWorker implements Callable { public void convertPatient(BabyModel pt, PatientService pser2) { pser2.setIsOld(1); - pser2.setCreateUser(pt.getBuildDoctor()); + if (StringUtils.isNotEmpty(pt.getBuildDoctor())){ + pser2.setCreateUser(pt.getBuildDoctor()); + } + if (pt.getBuildDate() != null) { pser2.setCreateDate(pt.getBuildDate()); } else { @@ -156,7 +159,10 @@ public class BabyBuildSerToPatientSerWorker implements Callable { // pser.setReceiveDate(new Date()); //服务开通操作人 - pser2.setUpdateUser(pt.getBuildDoctor()); + if (StringUtils.isNotEmpty(pt.getBuildDoctor())){ + pser2.setUpdateUser(pt.getBuildDoctor()); + } + } public void convertZZFWtoPserStatus(BabyModel pt, PatientService pser) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/BuildSerToPatientSerWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/BuildSerToPatientSerWorker.java index 58ce801..2d97e14 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/BuildSerToPatientSerWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/BuildSerToPatientSerWorker.java @@ -164,7 +164,10 @@ public class BuildSerToPatientSerWorker implements Callable { public void convertPatient(Patients pt, PatientService pser2) { pser2.setIsOld(1); - pser2.setCreateUser(pt.getBookbuildingDoctor()); + if (StringUtils.isNotEmpty(pt.getBookbuildingDoctor())){ + pser2.setCreateUser(pt.getBookbuildingDoctor()); + } + pser2.setCreateDate(pt.getBookbuildingDate()); pser2.setParentid(pt.getId()); pser2.setPid(pt.getPid()); @@ -179,7 +182,9 @@ public class BuildSerToPatientSerWorker implements Callable { //服务开通操作时间 pser2.setUpdateDate(pt.getBookbuildingDate()); //服务开通操作人 - pser2.setUpdateUser(pt.getBookbuildingDoctor()); + if (StringUtils.isNotEmpty(pt.getBookbuildingDoctor())){ + pser2.setUpdateUser(pt.getBookbuildingDoctor()); + } } public void convertZZFWtoPserStatus(Patients pt, PatientService pser) { -- 1.8.3.1