From a11bf2db97b067b1a7fd3c754ca4188ef75cb03c Mon Sep 17 00:00:00 2001 From: zhangchao Date: Tue, 11 Jun 2024 08:52:21 +0800 Subject: [PATCH] =?UTF-8?q?#fix:=E6=96=B0=E5=A2=9E=E4=BD=93=E9=87=8D?= =?UTF-8?q?=E8=90=A5=E5=85=BB=E6=8A=A5=E5=91=8A=E6=89=93=E5=8D=B0=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E5=88=A4=E6=96=AD=EF=BC=8C=E4=BC=98=E5=8C=96=E8=BE=85?= =?UTF-8?q?=E5=8A=A9=E5=8C=BB=E7=94=9F=E4=B8=BA=E9=80=81=E6=A3=80=E5=8C=BB?= =?UTF-8?q?=E7=94=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/permission/service/impl/LisServiceImpl.java | 9 ++++++--- .../operate/web/controller/PatientWeightController.java | 10 ++++++++++ .../com/lyms/platform/operate/web/facade/PatientFacade.java | 8 ++++++-- .../platform/operate/web/service/PatientWeightService.java | 2 ++ .../operate/web/service/impl/PatientWeightServiceImpl.java | 10 ++++++++++ .../operate/web/worker/BloodPressurePatientWorker.java | 3 ++- 6 files changed, 36 insertions(+), 6 deletions(-) diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java index 49a095d..1132c79 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java @@ -208,7 +208,7 @@ public class LisServiceImpl implements LisService { System.out.println("lis query patients null"); return; } - + String applyDoctor=model.getApplyDoctor(); AntExChuQuery antExChuQuery = new AntExChuQuery(); antExChuQuery.setParentId(patients.getId()); antExChuQuery.setYn(1); @@ -376,8 +376,9 @@ public class LisServiceImpl implements LisService { } if (b) { System.out.println("addAntenatalExamination"); - addAntenatalExamination(antenatalExaminationModel, antExChuModel, patients); + addAntenatalExamination(antenatalExaminationModel, antExChuModel, patients,applyDoctor); } + //GLU3 60分钟血糖 GLU4 120分钟血糖 GLUCm 空腹 if (StringUtils.isNotEmpty(params.get("GLU3"))){ p=true; @@ -567,7 +568,7 @@ public class LisServiceImpl implements LisService { @Autowired private AntExRecordService antExRecordService; - public void addAntenatalExamination(AntenatalExaminationModel antenatalExaminationModel, AntExChuModel antExChuModel, Patients patients) { + public void addAntenatalExamination(AntenatalExaminationModel antenatalExaminationModel, AntExChuModel antExChuModel, Patients patients,String applyDoctor) { if (antenatalExaminationModel.getId() != null) { antenatalExaminationModel.setCheckDate(new Date()); antenatalExaminationService.updateOneAnt(antenatalExaminationModel, antenatalExaminationModel.getId()); @@ -587,6 +588,8 @@ public class LisServiceImpl implements LisService { antExRecordModel.setType(1); antExRecordModel.setCheckTime(new Date()); antExRecordModel.setBuildTime(new Date()); + //临时赋值用来占用字段 + antExRecordModel.setCheckDoctor(applyDoctor); if (antExRecordModel.getDueDate() != null) { antExRecordModel.setStatus(antExRecordModel.getDueDate().compareTo(new Date()) > 0 ? 2 : 1); antExRecordModel.setDueStatus(antExRecordModel.getStatus()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java index 51999cb..873a4ce 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java @@ -145,6 +145,16 @@ public class PatientWeightController extends BaseController { public BaseResponse wxAddOrUpdateSync(PatientWeight patientWeight) { return patientWeightService.wxAddOrUpdateSync(patientWeight); } + /** + * 小程序查询体重管理状态 + * + * @return + */ + @ResponseBody + @RequestMapping(value = "/wx/serviceStatus", method = RequestMethod.GET) + public BaseResponse wxServiceStatus(String pid) { + return patientWeightService.wxServiceStatus(pid); + } @ResponseBody @RequestMapping(value = "/update", method = RequestMethod.POST) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 5c79b46..fae3c31 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -1408,7 +1408,10 @@ public class PatientFacade extends BaseServiceImpl { }*/else if ("11".equals(twinsType)){ Criteria criteria11 = Criteria.where("name").is("泌尿系统疾病：急、慢性肾脏疾病伴高血压、肾功能不全（肌酐超过正常值上限的1.5倍）"); yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria11)); - }else { + }else if("12".equals(twinsType)){ + Criteria criteria13 = Criteria.where("name").is("重度子痫前期、慢性高血压合并子痫前期"); + yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria13)); + }else { Criteria criteria1 = Criteria.where("name").is("妊娠期高血压疾病（除外红、橙色）"); Criteria criteria2 = Criteria.where("name").is("妊娠期高血压"); Criteria criteria3 = Criteria.where("name").is("子痫前期（轻）"); @@ -1421,7 +1424,8 @@ public class PatientFacade extends BaseServiceImpl { Criteria criteria10 = Criteria.where("name").is("慢性高血压合并子痫前期"); // Criteria criteria11 = Criteria.where("name").is("高血压（需要药物治疗）"); Criteria criteria12 = Criteria.where("name").is("泌尿系统疾病：急、慢性肾脏疾病伴高血压、肾功能不全（肌酐超过正常值上限的1.5倍）"); - yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria1, criteria2, criteria3, criteria4, criteria5, criteria6, criteria7,criteria8,criteria9,criteria10,criteria12)); + Criteria criteria13 = Criteria.where("name").is("重度子痫前期、慢性高血压合并子痫前期"); + yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria1, criteria2, criteria3, criteria4, criteria5, criteria6, criteria7,criteria8,criteria9,criteria10,criteria12,criteria13)); } List models = mongoTemplate.find(yn, BasicConfig.class); List rFactorList = new ArrayList <>(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/PatientWeightService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/PatientWeightService.java index d80fd98..a530dc5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/PatientWeightService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/PatientWeightService.java @@ -41,6 +41,8 @@ public interface PatientWeightService extends IBaseService { BaseResponse wxReport(String pid); + BaseResponse wxServiceStatus(String pid); + BaseResponse wxAddOrUpdate(PatientWeight patientWeight); BaseResponse wxAddOrUpdateSync(PatientWeight patientWeight); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java index a5f4640..d3f4012 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java @@ -1353,6 +1353,16 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient } @Override + public BaseResponse wxServiceStatus(String pid) { + PatientServiceQuery patientServiceQuery=new PatientServiceQuery(); + patientServiceQuery.setSerType(2); + patientServiceQuery.setPid(pid); + patientServiceQuery.setSerEndTime(new Date()); + List list= patientServiceService.queryPatientService(patientServiceQuery); + return RespBuilder.buildSuccess(list); + } + + @Override public BaseResponse wxAddOrUpdate(PatientWeight patientWeight) { String nowWeight = patientWeight.getNowWeight(); Patients patients = mongoTemplate.findById(patientWeight.getPatientId(), Patients.class); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/BloodPressurePatientWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/BloodPressurePatientWorker.java index bdb1d68..fb3b7c7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/BloodPressurePatientWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/BloodPressurePatientWorker.java @@ -278,7 +278,8 @@ public class BloodPressurePatientWorker implements Callable