From c66d8c02c404f425b8966a50c7deb153a28ee1c7 Mon Sep 17 00:00:00 2001 From: Administrator <184677810@qq.com> Date: Tue, 10 Sep 2019 11:06:08 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AD=9B=E6=9F=A5=E9=A1=B5=E9=9D=A2=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E2=80=9C=E6=AF=8D=E4=BA=B2=E8=80=B3=E8=81=8B=E5=9F=BA?= =?UTF-8?q?=E5=9B=A0=E7=AD=9B=E6=9F=A5=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/BabyPatientExtendEarScreen.java | 94 ++++++++++++++++ .../platform/operate/web/facade/BabyEarFacade.java | 44 +++++--- .../operate/web/facade/TrackDownFacade.java | 36 ++++-- .../operate/web/request/BabyScreenAddRequest.java | 123 +++++++++++++++++++-- 4 files changed, 266 insertions(+), 31 deletions(-) diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreen.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreen.java index 4c48370..7b2fc73 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreen.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreen.java @@ -82,6 +82,27 @@ public class BabyPatientExtendEarScreen extends AbstracUuidEntity { private Integer rrna1555; /** + * 母亲耳聋筛查 + */ + private Integer motherGjb2Del35; + + private Integer motherGjb2Del176; + + private Integer motherGjb2Del235; + + private Integer motherGjb2Del299; + + private Integer motherGjb3Slc26a4538; + + private Integer motherGjb3Slc26a42168; + + private Integer motherGjb3Slc26a4Ivs7; + + private Integer motherRrna1494; + + private Integer motherRrna1555; + + /** * 处理意见 1=复筛 2=诊断 */ private Integer processOptionType; @@ -128,6 +149,79 @@ public class BabyPatientExtendEarScreen extends AbstracUuidEntity { //0-正常 1-删除 private Integer status; + + public Integer getMotherGjb2Del35() { + return motherGjb2Del35; + } + + public void setMotherGjb2Del35(Integer motherGjb2Del35) { + this.motherGjb2Del35 = motherGjb2Del35; + } + + public Integer getMotherGjb2Del176() { + return motherGjb2Del176; + } + + public void setMotherGjb2Del176(Integer motherGjb2Del176) { + this.motherGjb2Del176 = motherGjb2Del176; + } + + public Integer getMotherGjb2Del235() { + return motherGjb2Del235; + } + + public void setMotherGjb2Del235(Integer motherGjb2Del235) { + this.motherGjb2Del235 = motherGjb2Del235; + } + + public Integer getMotherGjb2Del299() { + return motherGjb2Del299; + } + + public void setMotherGjb2Del299(Integer motherGjb2Del299) { + this.motherGjb2Del299 = motherGjb2Del299; + } + + public Integer getMotherGjb3Slc26a4538() { + return motherGjb3Slc26a4538; + } + + public void setMotherGjb3Slc26a4538(Integer motherGjb3Slc26a4538) { + this.motherGjb3Slc26a4538 = motherGjb3Slc26a4538; + } + + public Integer getMotherGjb3Slc26a42168() { + return motherGjb3Slc26a42168; + } + + public void setMotherGjb3Slc26a42168(Integer motherGjb3Slc26a42168) { + this.motherGjb3Slc26a42168 = motherGjb3Slc26a42168; + } + + public Integer getMotherGjb3Slc26a4Ivs7() { + return motherGjb3Slc26a4Ivs7; + } + + public void setMotherGjb3Slc26a4Ivs7(Integer motherGjb3Slc26a4Ivs7) { + this.motherGjb3Slc26a4Ivs7 = motherGjb3Slc26a4Ivs7; + } + + public Integer getMotherRrna1494() { + return motherRrna1494; + } + + public void setMotherRrna1494(Integer motherRrna1494) { + this.motherRrna1494 = motherRrna1494; + } + + public Integer getMotherRrna1555() { + return motherRrna1555; + } + + public void setMotherRrna1555(Integer motherRrna1555) { + this.motherRrna1555 = motherRrna1555; + } + public String getPid() { return pid; } 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 bd1013c..609bb22 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 @@ -496,7 +496,7 @@ public class BabyEarFacade { if (PatientSerEnums.SerTypeEnums.babyjzzz.getId().intValue() == Integer.parseInt(serInfo.get("serType"))) { baby.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId()); baby.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId()); - }else if (PatientSerEnums.SerTypeEnums.babyBzfw.getId().intValue() == Integer.parseInt(serInfo.get("serType"))) { + } else if (PatientSerEnums.SerTypeEnums.babyBzfw.getId().intValue() == Integer.parseInt(serInfo.get("serType"))) { baby.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); baby.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId()); } @@ -521,7 +521,7 @@ public class BabyEarFacade { patientService.setParentid(baby.getId()); patientService.setPid(baby.getPid()); try { - patientServiceFacade.addPatientService(patientService, userId,hId); + patientServiceFacade.addPatientService(patientService, userId, hId); } catch (Exception e) { System.out.println("儿童建档服务开通异常！"); e.printStackTrace(); @@ -800,7 +800,7 @@ public class BabyEarFacade { babyEarBaseView.setBarCode(babyPatientExtendEar.getBarCode()); babyEarBaseView.setNation(getBasicConfig(babyPatientExtendEar.getNation())); babyEarBaseView.setRemark(babyModel.getMremark()); - /* 诊断指导 */ + /* 诊断指导 */ String diagnosis = ""; if (org.apache.commons.lang.StringUtils.isNotEmpty(babyPatientExtendEar.getDischargeDiagnosis())) { String[] dischargeDiagnosis = babyPatientExtendEar.getmHighRiskFactorId().split(","); @@ -911,7 +911,7 @@ public class BabyEarFacade { StringBuffer historyStr = new StringBuffer(""); if (historyJson.containsKey("yesOrNo")) { Integer yesOrNo = historyJson.getInteger("yesOrNo"); - if (yesOrNo!=null && yesOrNo == 1) { + if (yesOrNo != null && yesOrNo == 1) { historyStr.append("有,"); if (historyJson.containsKey("yinJiu")) { boolean yinJiu = historyJson.getBoolean("yinJiu"); @@ -1113,11 +1113,11 @@ public class BabyEarFacade { StringBuffer historyStr = new StringBuffer(""); if (historyJson.containsKey("yesOrNo")) { Integer yesOrNo = historyJson.getInteger("yesOrNo"); - if (yesOrNo!=null && yesOrNo == 1) { + if (yesOrNo != null && yesOrNo == 1) { historyStr.append("有"); if (historyJson.containsKey("other")) { Integer other = historyJson.getInteger("other"); - if(other!=null){ + if (other != null) { historyStr.append("(孕" + other + "周)"); } } @@ -1130,7 +1130,7 @@ public class BabyEarFacade { JSONObject historyJson = JSONObject.parseObject(babyPatientExtendEarMother.getDrugAppName()); if (historyJson.containsKey("yesOrNo")) { Integer yesOrNo = historyJson.getInteger("yesOrNo"); - if (yesOrNo!=null && yesOrNo == 1) { + if (yesOrNo != null && yesOrNo == 1) { historyJson.put("yesOrNo", "有"); } else { historyJson.put("yesOrNo", "无"); @@ -1143,7 +1143,7 @@ public class BabyEarFacade { JSONObject historyJson = JSONObject.parseObject(babyPatientExtendEarMother.getAbortionHistoryType()); if (historyJson.containsKey("yesOrNo")) { Integer yesOrNo = historyJson.getInteger("yesOrNo"); - if (yesOrNo!=null && yesOrNo == 1) { + if (yesOrNo != null && yesOrNo == 1) { historyJson.put("yesOrNo", "有"); } else { historyJson.put("yesOrNo", "无"); @@ -1161,7 +1161,7 @@ public class BabyEarFacade { JSONObject historyJson = JSONObject.parseObject(babyPatientExtendEarMother.getHarmfulSubstanceType()); if (historyJson.containsKey("yesOrNo")) { Integer yesOrNo = historyJson.getInteger("yesOrNo"); - if (yesOrNo!=null && yesOrNo == 1) { + if (yesOrNo != null && yesOrNo == 1) { historyJson.put("yesOrNo", "有"); } else { historyJson.put("yesOrNo", "无"); @@ -1176,7 +1176,7 @@ public class BabyEarFacade { JSONObject historyJson = JSONObject.parseObject(babyPatientExtendEarMother.getBadLifeHistoryType()); if (historyJson.containsKey("yesOrNo")) { Integer yesOrNo = historyJson.getInteger("yesOrNo"); - if (yesOrNo!=null && yesOrNo == 1) { + if (yesOrNo != null && yesOrNo == 1) { historyStr.append("有,"); } } @@ -1214,7 +1214,7 @@ public class BabyEarFacade { JSONObject historyJson = JSONObject.parseObject(babyPatientExtendEarMother.getMedicalHistoryType()); if (historyJson.containsKey("yesOrNo")) { Integer yesOrNo = historyJson.getInteger("yesOrNo"); - if (yesOrNo!=null && yesOrNo == 1) { + if (yesOrNo != null && yesOrNo == 1) { historyStr.append("有,"); } } @@ -1268,7 +1268,7 @@ public class BabyEarFacade { JSONObject historyJson = JSONObject.parseObject(babyPatientExtendEarMother.getBnormalPregnancyHistoryType()); if (historyJson.containsKey("yesOrNo")) { Integer yesOrNo = historyJson.getInteger("yesOrNo"); - if (yesOrNo!=null && yesOrNo == 1) { + if (yesOrNo != null && yesOrNo == 1) { historyStr.append("有,"); } } @@ -1401,7 +1401,7 @@ public class BabyEarFacade { if (babyPatientExtendEarBirth.getApgarScoreOne() != null && babyPatientExtendEarBirth.getApgarScoreFive() != null && babyPatientExtendEarBirth.getApgarScoreTen() != null) { String apgarScore = babyPatientExtendEarBirth.getApgarScoreOne() + UnitConstants.FEN + " - " + babyPatientExtendEarBirth.getApgarScoreFive() + UnitConstants.FEN + " - " + babyPatientExtendEarBirth.getApgarScoreTen() + UnitConstants.FEN; babyEarBirthView.setApgarScore(apgarScore); - }else if(babyPatientExtendEarBirth.getApgarUnknown()!=null&&babyPatientExtendEarBirth.getApgarUnknown()==1){ + } else if (babyPatientExtendEarBirth.getApgarUnknown() != null && babyPatientExtendEarBirth.getApgarUnknown() == 1) { babyEarBirthView.setApgarScore("不详"); } @@ -1575,7 +1575,7 @@ public class BabyEarFacade { * @param babyEarId 儿童听筛id * @return */ - public BaseResponse deleteBabyEar(String babyEarId,Integer userId) { + public BaseResponse deleteBabyEar(String babyEarId, Integer userId) { if (StringUtils.isEmpty(babyEarId)) { return new BaseResponse().setErrormsg("请传入请求参数").setErrorcode(ErrorCodeConstants.SUCCESS); } @@ -1602,7 +1602,7 @@ public class BabyEarFacade { babyPatientExtendEar.setId(babyEarId); babyPatientExtendEarService.updateBabyPatientExtendEar(babyPatientExtendEar); - operateLogFacade.addDeleteOptLog(userId,Integer.parseInt(babyPatientExtendEar.getCreateHospitalId()),babyPatientExtendEar,OptActionEnums.DELETE.getId(),"删除儿童档案"); + operateLogFacade.addDeleteOptLog(userId, Integer.parseInt(babyPatientExtendEar.getCreateHospitalId()), babyPatientExtendEar, OptActionEnums.DELETE.getId(), "删除儿童档案"); return RespBuilder.buildSuccess(); } @@ -1761,6 +1761,18 @@ public class BabyEarFacade { data.put("rrna1494Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getRrna1494() == null ? 0 : babyPatientExtendEarScreen.getRrna1494())); data.put("rrna1555", babyPatientExtendEarScreen.getRrna1555() == null ? "" : babyPatientExtendEarScreen.getRrna1555()); data.put("rrna1555Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getRrna1555() == null ? 0 : babyPatientExtendEarScreen.getRrna1555())); + + data.put("motherGjb2Del35", DeafEnums.getTitle(babyPatientExtendEarScreen.getMotherGjb2Del35() == null ? 0 : babyPatientExtendEarScreen.getMotherGjb2Del35())); + data.put("motherGjb2Del176", DeafEnums.getTitle(babyPatientExtendEarScreen.getMotherGjb2Del176() == null ? 0 : babyPatientExtendEarScreen.getMotherGjb2Del176())); + data.put("motherGjb2Del235", DeafEnums.getTitle(babyPatientExtendEarScreen.getMotherGjb2Del235() == null ? 0 : babyPatientExtendEarScreen.getMotherGjb2Del235())); + data.put("motherGjb2Del299", DeafEnums.getTitle(babyPatientExtendEarScreen.getMotherGjb2Del299() == null ? 0 : babyPatientExtendEarScreen.getMotherGjb2Del299())); + data.put("motherGjb3Slc26a4538", DeafEnums.getTitle(babyPatientExtendEarScreen.getMotherGjb3Slc26a4538() == null ? 0 : babyPatientExtendEarScreen.getMotherGjb3Slc26a4538())); + data.put("motherGjb3Slc26a42168", DeafEnums.getTitle(babyPatientExtendEarScreen.getMotherGjb3Slc26a42168() == null ? 0 : babyPatientExtendEarScreen.getMotherGjb3Slc26a42168())); + data.put("motherGjb3Slc26a4Ivs7", DeafEnums.getTitle(babyPatientExtendEarScreen.getMotherGjb3Slc26a4Ivs7() == null ? 0 : babyPatientExtendEarScreen.getMotherGjb3Slc26a4Ivs7())); + data.put("motherRrna1494", DeafEnums.getTitle(babyPatientExtendEarScreen.getMotherRrna1494() == null ? 0 : babyPatientExtendEarScreen.getMotherRrna1494())); + data.put("motherRrna1555", DeafEnums.getTitle(babyPatientExtendEarScreen.getMotherRrna1555() == null ? 0 : babyPatientExtendEarScreen.getMotherRrna1555())); + + data.put("processOptionType", babyPatientExtendEarScreen.getProcessOptionType());//1=复筛 2=诊断 data.put("processOptionTypeStr", babyPatientExtendEarScreen.getProcessOptionType() == null ? "初诊" : babyPatientExtendEarScreen.getProcessOptionType() == 1 ? "复筛" : "诊断");//1=复筛 2=诊断 data.put("processOptionDesc", babyPatientExtendEarScreen.getProcessOptionDesc()); @@ -1844,7 +1856,7 @@ public class BabyEarFacade { babyPatientExtendEarScreenService.updateBabyPatientExtendEarScreen(babyPatientExtendEarScreen); - operateLogFacade.addModifyOptLog(userId, Integer.valueOf(hospitalId), before,babyPatientExtendEarScreen, OptActionEnums.ADD.getId(), "修改听力筛查"); + operateLogFacade.addModifyOptLog(userId, Integer.valueOf(hospitalId), before, babyPatientExtendEarScreen, OptActionEnums.ADD.getId(), "修改听力筛查"); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java index 8ab701f..4d32576 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java @@ -360,8 +360,6 @@ public class TrackDownFacade { patientsQuery.setFmMode(downQueryRequest.getFmType()); isPatient = true; } - - if (null != downQueryRequest.getPostpartumDays()) {//产后天数 Calendar instance = Calendar.getInstance(); instance.setTime(new Date()); @@ -409,13 +407,13 @@ public class TrackDownFacade { if (downQueryRequest.getLevel() != null) {//高危等级 patientsQuery.setrLevel(downQueryRequest.getLevel()); //只查孕妇 - patientsQuery.setType(1); patientsQuery.setLastMensesStart(DateUtil.getMonth(-10));//只查询当前时间十个月前的数据 考虑性能问题 isPatient = true; } if (downQueryRequest.getRiskFactorId() != null) {//高危因素 //高危统计中的自定义高危 if ("otherRiskId".equals(downQueryRequest.getLevel())) { + patientsQuery.setType(1); patientsQuery.setNotoRiskFactor(""); patientsQuery.setoRiskFactor("true"); } else { @@ -450,7 +448,6 @@ public class TrackDownFacade { List pids = new ArrayList<>(); for (Patients ps : patientses) { pids.add(ps.getId()); - System.out.println(ps.getId()); } if (downQueryRequest.getTrackType() == 4) { List sievePatients = new ArrayList<>(); @@ -461,7 +458,6 @@ public class TrackDownFacade { List sieveModels = sieveService.queryList(sieveQuery); for (SieveModel sieveModel : sieveModels) { sievePatients.add(sieveModel.getParentId()); - System.out.println("未产筛的ParentIds" + sieveModel.getParentId()); } //去掉做个产筛的人 pids.removeAll(sievePatients); @@ -472,14 +468,39 @@ public class TrackDownFacade { } //设置查询queryTrackType 如果是4 执行产筛的查询条件 downRecordQuery.setQueryTrackType(downQueryRequest.getTrackType()); - - downRecordQuery.setAreaId(downQueryRequest.getAreaId()); downRecordQuery.setProvinceId(downQueryRequest.getProvinceId()); downRecordQuery.setCityId(downQueryRequest.getCityId()); downRecordQuery.setStreetId(downQueryRequest.getStreetId()); downRecordQuery.setKey(downQueryRequest.getKey()); /** + *孕期检查 + * */ + if (downQueryRequest.getTrackType() == 3) { + Date endDate = DateUtil.addDay(DateUtil.formatDate(new Date()), -266); + downRecordQuery.setLastMensesStart(endDate); + } + + /** + * 产筛检查 + * */ + if (downQueryRequest.getTrackType() == 4) { + Date endDate = DateUtil.addDay(DateUtil.formatDate(new Date()), -84); + Date start = DateUtil.addDay(DateUtil.formatDate(new Date()), -160); + downRecordQuery.setLastMensesStart(start); + downRecordQuery.setLastMensesEnd(endDate); + } + /** + * 分娩追访 + * */ + if (downQueryRequest.getTrackType() == 5) { + Date endDate = DateUtil.addDay(DateUtil.formatDate(new Date()), -259); + Date start = DateUtil.addDay(DateUtil.formatDate(new Date()), -280); + downRecordQuery.setLastMensesStart(start); + downRecordQuery.setAppointmentDateEnd(endDate); + } + + /** * 孕妇追访功能新增搜索条件20190709 * */ //妇女建档时间 @@ -707,7 +728,6 @@ public class TrackDownFacade { for (TrackDownRecord trackDownRecord : downRecordList) { //追访类型 Integer trackType = trackDownRecord.getTrackType(); - //查询的追访类型 trackDownRecord.setTrackType(downQueryRequest.getTrackType()); Map map = downTypeHandler.build(trackDownRecord, mongoTemplate, downQueryRequest.getEncryption()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyScreenAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyScreenAddRequest.java index 01f98fe..c5222f0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyScreenAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyScreenAddRequest.java @@ -9,9 +9,8 @@ import org.hibernate.validator.constraints.NotEmpty; import javax.validation.constraints.Pattern; /** - * - * 增加产晒 - * + * 增加产晒 + *

* Created by jiangjiazhi on 2017/5/23. */ @Form @@ -24,7 +23,7 @@ public class BabyScreenAddRequest implements IBasicRequestConvert