diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/RemoteService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/RemoteService.java index 3afe36f..c26c0b1 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/RemoteService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/RemoteService.java @@ -16,7 +16,7 @@ public class RemoteService { // private String BASE_URL = PropertiesUtils.getPropertyValue("platform.operate.api.validate.url"); // private String BASE_URL = "http://dev-rp-api.healthbaby.com.cn:8082/"; - private String BASE_URL = "http://localhost:8080/"; + private String BASE_URL = "http://localhost:28080/"; /** * 作废优惠券相关 diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java index b7fe19f..d1fb509 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java @@ -276,7 +276,7 @@ public class PatientsService { updatePatient(patients); /** 自动分娩 >> 作废未使用的产检券 */ - remoteService.invalidCoupon(patients.getPid(), "2", RemoteUrlEnum.INVALID_COUPON_URL); +// remoteService.invalidCoupon(patients.getPid(), "2", RemoteUrlEnum.INVALID_COUPON_URL); //作废产检劵 /* patientCheckTicketService.cancelCheckTicket(patients.getHospitalId(), patients.getId());*/ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RemoteFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RemoteFacade.java index 956d6ed..50878c7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RemoteFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RemoteFacade.java @@ -51,6 +51,7 @@ public class RemoteFacade { String bpStatus = getBpStatus(entry.getValue().get("ssy").toString(), entry.getValue().get("szy").toString()); if(StringUtils.isNotEmpty(bpStatus)) { patients = (patients == null ? mongoTemplate.findById(bloodPressure.getParentId(), Patients.class) : patients); + if(patients == null) continue; setTempInfo(bloodPressure.getId() + ID_SEPARATOR + entry.getKey() + ID_SEPARATOR + bloodPressure.getModified().getTime(), temp, patients, entry.getValue().get("ssy") + "/" + entry.getValue().get("szy"), bpStatus, "(收缩压:90-140 舒张压:60-90)", ErrorPatientEnums.BLOOD_PRESSURE, bloodPressure.getModified()); } @@ -104,6 +105,7 @@ public class RemoteFacade { System.out.println(patientWeight.getId() + ">>> " + entry); if(DateUtil.parseYMD(entry.getKey()).getTime() >= yesterday.getTime()) { patients = (patients == null ? mongoTemplate.findById(patientWeight.getPatientId(), Patients.class) : patients); + if(patients == null) continue; Integer week = DateUtil.getWeek2(patients.getLastMenses(), DateUtil.parseYMD(entry.getKey())); Double addWeight = getAddWeight(patientWeight.getBeforeWeight(), entry.getValue()); Double low = lowMap.get(week); @@ -133,6 +135,7 @@ public class RemoteFacade { if(DateUtil.parseYMD(entry.getKey()).getTime() >= yesterday.getTime()) { if(entry.getValue() < 36D || entry.getValue() > 38.5D ) { patients = (patients == null ? mongoTemplate.findById(tempModel.getParentId(), Patients.class) : patients); + if(patients == null) continue; setTempInfo(tempModel.getId() + ID_SEPARATOR + entry.getKey() + ID_SEPARATOR + tempModel.getModified().getTime(), temp, patients, entry.getValue() + "", entry.getValue() < 36D ? "低热" : "高热", "(36-37.4)", ErrorPatientEnums.TEMP, tempModel.getModified()); }