From 7ef64d5738abfd66a53163511ed2a342ead15c4e Mon Sep 17 00:00:00 2001 From: zhangchao Date: Mon, 20 May 2024 19:18:31 +0800 Subject: [PATCH] =?UTF-8?q?#fix:=E4=BF=AE=E6=94=B9=E4=B8=B0=E5=AE=81?= =?UTF-8?q?=E4=BA=A7=E6=A3=80=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/AntExRecordFacade.java | 3 +- .../web/facade/AntenatalExaminationFacade.java | 3 +- .../operate/web/facade/BookbuildingFacade.java | 44 +++++++++------- .../operate/web/facade/PatientServiceFacade.java | 59 ++++++++++++---------- 4 files changed, 60 insertions(+), 49 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java index 728627c..c945f41 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java @@ -407,8 +407,7 @@ public class AntExRecordFacade { * * @return */ - public BaseResponse findList(AntExManagerQueryRequest antExManagerQueryRequest, Integer userId, boolean isRegion, String isPage, boolean isCurrent) { - String hospitalId = autoMatchFacade.getHospitalId(userId); + public BaseResponse findList(AntExManagerQueryRequest antExManagerQueryRequest, Integer userId, boolean isRegion, String isPage, boolean isCurrent) { String hospitalId = autoMatchFacade.getHospitalId(userId); PatientsQuery patientsQuery = new PatientsQuery(); List patientses = null; if (StringUtils.isNotEmpty(antExManagerQueryRequest.getQueryNo())) { 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..3269f48 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 @@ -1594,7 +1594,8 @@ public class AntenatalExaminationFacade { //根据patient查询是否存在追访信息 TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery(); downRecordQuery.setParentId(patient.getId()); - downRecordQuery.setStatus(3); + //TODO 不知道这个status是干嘛用的 所以注释了 测试有问题的话再放开 + //downRecordQuery.setStatus(3); List records = trackDownRecordService.queryTrackDown(downRecordQuery); if (CollectionUtils.isNotEmpty(records)) {//存在则进行修改，只修改基本信息，不修改显示状态和追访类型 TrackDownRecord trackDownRecord1 = records.get(0); 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 ba19047..f7531ed 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 @@ -606,7 +606,7 @@ public class BookbuildingFacade { //根据patient查询是否存在追访信息 TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery(); downRecordQuery.setParentId(patient.getId()); - downRecordQuery.setStatus(3); + // downRecordQuery.setStatus(3); List records = trackDownRecordService.queryTrackDown(downRecordQuery); if (CollectionUtils.isNotEmpty(records)) {//存在则进行修改，只修改基本信息，不修改显示状态和追访类型 TrackDownRecord trackDownRecord1 = records.get(0); @@ -1388,7 +1388,7 @@ public class BookbuildingFacade { for (int i = 0, j = patientList.size(); i < j; i++) { Patients patients = patientList.get(i); try { - patientServiceFacade.sendServiceMsg(patients,SmsServiceEnums.FWKT.getId(),"您好，请点击此处查看开通服务内容详情。","大同市第一人民医院",patients.getType()); + patientServiceFacade.sendServiceMsg(patients,SmsServiceEnums.FWKT.getId(),"您好，请点击此处查看开通服务内容详情。","大同市第一人民医院",patients.getType(),null); } catch (Exception e) { logger.error("weekSync InterruptedException," + e.getMessage()); } @@ -4051,8 +4051,8 @@ public class BookbuildingFacade { PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setYn(1); patientsQuery.setHospitalId("2100001504"); - if (StringUtils.isNotEmpty(map.get("username"))) { - patientsQuery.setName(map.get("username")); + if (StringUtils.isNotEmpty(map.get("cardNo"))) { + patientsQuery.setCardNo(map.get("cardNo")); //判断该身份证号码是否有孕妇建档 在该医院 final List patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); if (CollectionUtils.isNotEmpty(patients)) { @@ -4072,7 +4072,7 @@ public class BookbuildingFacade { downRecordQuery.setParentId(patient.getId()); trackDownRecordService.delete(downRecordQuery); } - yunBookbuildingService.delete(patientsQuery); + //yunBookbuildingService.delete(patientsQuery); } } } @@ -4926,9 +4926,7 @@ public class BookbuildingFacade { public void insertBatch2(String name) { - List> list = ExcelUtil.readExcl("E:\\建档数据同步\\" + name, 2);// - for (final Map map : list) { commonThreadPool.execute(new Runnable() { @Override @@ -4936,15 +4934,20 @@ public class BookbuildingFacade { PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setYn(1); patientsQuery.setHospitalId("2100001504"); + patientsQuery.setType(1); boolean b = false; Patients patient = null; + Integer num=1; if (StringUtils.isNotEmpty(map.get("cardNo"))) { - patientsQuery.setCardNo(map.get("cardNo")); + patientsQuery.setCardNo(map.get("cardNo").trim()); //判断该身份证号码是否有孕妇建档 在该医院 final List patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); if (CollectionUtils.isNotEmpty(patients)) { b = true; patient = patients.get(0); + if (patient.getNextCheckTime()!=null&&patient.getNextCheckTime().compareTo(DateUtil.parseYMD(map.get("nextCheckTime")))<0){ + num=2; + } } else { patient = new Patients(); } @@ -4966,7 +4969,7 @@ public class BookbuildingFacade { } } if (StringUtils.isEmpty(map.get("lastMenses"))){ - patient.setLastMenses(DateUtil.getCurrentDueDate(map.get("currentDueDate"), map.get("checkDate"))); + patient.setLastMenses(DateUtil.getCurrentDueDate(map.get("currentDueDate"), map.get("bookbuildingDate"))); }else { patient.setLastMenses(DateUtil.parseYMD(map.get("lastMenses"))); } @@ -4988,15 +4991,15 @@ public class BookbuildingFacade { if (StringUtils.isNotEmpty(map.get("cardNo"))) { PersonModelQuery personModelQuery = new PersonModelQuery(); - personModelQuery.setCardNo(map.get("cardNo")); + personModelQuery.setCardNo(map.get("cardNo").trim()); personModelQuery.setYn(YnEnums.YES.getId()); personModelQuery.setTypes(new Integer[]{1, 3}); //孕妇或者产妇基本信息 List personModels = personService.queryPersons(personModelQuery); PersonModel pmodel = new PersonModel(); pmodel.setName(map.get("username")); - pmodel.setPhone(map.get("phone")); - pmodel.setCardNo(map.get("cardNo")); + pmodel.setPhone(map.get("phone").trim()); + pmodel.setCardNo(map.get("cardNo").trim()); pmodel.setType(type); pmodel.setModified(new Date()); if (CollectionUtils.isNotEmpty(personModels) && personModels.get(0) != null) { @@ -5010,14 +5013,14 @@ public class BookbuildingFacade { } patient.setYn(1); patient.setUsername(map.get("username")); - patient.setCardNo(map.get("cardNo")); + patient.setCardNo(map.get("cardNo").trim()); patient.setHospitalId("2100001504"); patient.setBookbuildingDate(DateUtil.parseYMD(map.get("bookbuildingDate"))); patient.setAge(Integer.valueOf(map.get("age"))); patient.setBirth(DateUtil.parseYMD(map.get("birth"))); // patient.setAddressRegister(map.get("xian") + map.get("xiang") + map.get("cun")); - patient.setPhone(map.get("phone")); + patient.setPhone(map.get("phone").trim()); patient.setFirstCheckId(String.valueOf(patient.getOperator())); patient.setFirstCheckTime(patient.getBookbuildingDate()); if (patient.getLastMenses() != null) { @@ -5119,7 +5122,7 @@ public class BookbuildingFacade { } - Integer num = Integer.valueOf(map.get("num")); + // Integer num = Integer.valueOf(map.get("num")); AntExRecordModel antExRecordModel = new AntExRecordModel(); AntExChuModel antExChuModel = new AntExChuModel(); String riskFactor = map.get("name"); @@ -5204,8 +5207,10 @@ public class BookbuildingFacade { antExChuModel.setPid(patient.getPid()); antExChuModel.setProdDoctor(String.valueOf(patient.getOperator())); + + antExChuModel= antenatalExaminationService.addOneAntEx(antExChuModel); + antExRecordModel.setfId(antExChuModel.getId()); antExRecordService.addOneRecord(antExRecordModel); - antenatalExaminationService.addOneAntEx(antExChuModel); //初诊是添加追访记录 addTrackDownInfo(patient.getOperator(), patient); } @@ -5227,8 +5232,11 @@ public class BookbuildingFacade { antenatalExaminationModel.setNextCheckTime(DateUtil.parseYMD(map.get("nextCheckTime"))); antenatalExaminationModel.setCurrentDueDate(map.get("currentDueDate")); antenatalExaminationModel.setCheckDate(DateUtil.parseYMD(map.get("checkDate"))); - antenatalExaminationService.addOneBabyAnt(antenatalExaminationModel); - antExRecordService.addOneRecord(antExRecordModel); + antenatalExaminationModel=antenatalExaminationService.addOneBabyAnt(antenatalExaminationModel); + antExRecordModel.setfId(antenatalExaminationModel.getId()); + antExRecordService.addOneRecord(antExRecordModel); + //添加复诊时添加追访信息 + antenatalExaminationFacade.addTrackDownInfo(patient.getOperator(), patient, map.get("nextCheckTime")); } } }); 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 3106245..9b6ed93 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 @@ -561,7 +561,7 @@ public class PatientServiceFacade { patient.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId()); bookbuildingFacade.updatePatientSerById(ps.getParentid(), patient); - sendServiceMsg(patients,SmsServiceEnums.FWKT.getId(),"您好，请点击此处查看开通服务内容详情。","大同市第一人民医院",ServiceObjEnums.YUNOBJ.getId()); + sendServiceMsg(patients,SmsServiceEnums.FWKT.getId(),"您好，请点击此处查看开通服务内容详情。","大同市第一人民医院",ServiceObjEnums.YUNOBJ.getId(),1); } else if (PatientSerEnums.SerTypeEnums.bzfw.getId().intValue() == Integer.parseInt(serInfo.get("serType"))) { System.out.println("555555555555555555555555"); @@ -584,7 +584,7 @@ public class PatientServiceFacade { patient.setServiceType(ServiceTypeEnums.ADD_MAT_DELIVER_SERVICE.getId()); patient.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId()); bookbuildingFacade.updatePatientSerById(ps.getParentid(), patient); - sendServiceMsg(patients,SmsServiceEnums.FWKT.getId(),"您好，请点击此处查看开通服务内容详情。","大同市第一人民医院",ServiceObjEnums.CHANOBJ.getId()); + sendServiceMsg(patients,SmsServiceEnums.FWKT.getId(),"您好，请点击此处查看开通服务内容详情。","大同市第一人民医院",ServiceObjEnums.CHANOBJ.getId(),1); } } @@ -598,7 +598,7 @@ public class PatientServiceFacade { return baseResponse; } //大同医院服务推送\短信 - public void sendServiceMsg(Patients patient, Integer subTypeId, String first, String keyWord1,Integer objType){ + public void sendServiceMsg(Patients patient, Integer subTypeId, String first, String keyWord1,Integer objType,Integer type){ System.out.println("333333333333333333333"); if ("2100002419".equals(patient.getHospitalId())) { try { @@ -627,31 +627,34 @@ public class PatientServiceFacade { mr.setCreated(DateUtil.getyyyy_MM_dd_hms(new Date())); mr.setWxTempId(WxTempleteIdEnums.YUX_XUE_KE_CHEN_FB.getId()); messages.add(mr); - String title = "服务提醒短信"; - String messageContent = "【大同市第一人民医院】" + "欢迎加入我院健康咨询服务：请微信-添加朋友-公众号-搜索“美生孕育”关注；点击开通成功提醒，手机号获取验证码成功登录宝贝孕程小程序。请确保登录成功并持续关注“美生孕育”公众号，正常接收产检提醒，享受个性化指导文章推送、孕期随访及营养指导等服务。"; - MsgRequest request = new MsgRequest(); - //1 推送服务， 2 推送和短信服务，3短信服务 - request.setServiceType(3); - //短信发送状态 - request.setSmsStatus(SmsStatusEnums.WFS.getId()); - //平台ID - request.setTypeId(ProjectTypeEnums.YNXT.getId()); - //服务对象 1孕妇 2儿童 3产妇 - request.setObjType(1); - request.setPhone(patient.getPhone()); - request.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date())); - request.setSubTypeId(SmsServiceEnums.DXFW.getId()); - request.setStatus(MsgStatusEnums.NO_SEND.getId()); - request.setTimeType(SmsTimeTypeEnums.ONTIME.getId()); - request.setHospitalId("2100002419"); - request.setPatientId(patient.getId()); - request.setTempId(patient.getId()); - mr.setWxTempId(WxTempleteIdEnums.YUX_XUE_KE_CHEN_FB.getId()); - request.setCreated(DateUtil.getyyyy_MM_dd_hms(new Date())); - request.setFirst(messageContent); - request.setKeyword1(title); - request.setKeyword2(DateUtil.getyyyy_MM_dd(DateUtil.addDay(new Date(),0))); - messages.add(request); + if (type!=null){ + String title = "服务提醒短信"; + String messageContent = "【大同市第一人民医院】" + "欢迎加入我院健康咨询服务：请微信-添加朋友-公众号-搜索“美生孕育”关注；点击开通成功提醒，手机号获取验证码成功登录宝贝孕程小程序。请确保登录成功并持续关注“美生孕育”公众号，正常接收产检提醒，享受个性化指导文章推送、孕期随访及营养指导等服务。"; + MsgRequest request = new MsgRequest(); + //1 推送服务， 2 推送和短信服务，3短信服务 + request.setServiceType(3); + //短信发送状态 + request.setSmsStatus(SmsStatusEnums.WFS.getId()); + //平台ID + request.setTypeId(ProjectTypeEnums.YNXT.getId()); + //服务对象 1孕妇 2儿童 3产妇 + request.setObjType(1); + request.setPhone(patient.getPhone()); + request.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date())); + request.setSubTypeId(SmsServiceEnums.DXFW.getId()); + request.setStatus(MsgStatusEnums.NO_SEND.getId()); + request.setTimeType(SmsTimeTypeEnums.ONTIME.getId()); + request.setHospitalId("2100002419"); + request.setPatientId(patient.getId()); + request.setTempId(patient.getId()); + mr.setWxTempId(WxTempleteIdEnums.YUX_XUE_KE_CHEN_FB.getId()); + request.setCreated(DateUtil.getyyyy_MM_dd_hms(new Date())); + request.setFirst(messageContent); + request.setKeyword1(title); + request.setKeyword2(DateUtil.getyyyy_MM_dd(DateUtil.addDay(new Date(),0))); + messages.add(request); + } + smsConfigFacade.saveMsg(messages, patient.getHospitalId()); } catch (Exception e) { logger.error("sendServiceMsg Exception " + e); -- 1.8.3.1