jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 9c98ef3d12714a45aed38763fef4ec3b9f142ecf

Authored by liquanyu
1 parent 3894fde5e3
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 4 changed files with 92 additions and 20 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java View file @ 9c98ef3
... ... @@ -1676,6 +1676,22 @@
1676 1676 model.setCheckDoctor(doctorId);
1677 1677 model.setEdema(edema);
1678 1678 antenatalExaminationService.updateOneAnt(model, model.getId());
  1679 +
  1680 + if (StringUtils.isNotEmpty(nextTime) && StringUtils.isNotEmpty(doctorId) )
  1681 + {
  1682 + AntExRecordQuery antExRecordQuery = new AntExRecordQuery();
  1683 + antExRecordQuery.setfId(model.getId());
  1684 + List<AntExRecordModel> recordModels = recordService.queryAntExRecords(antExRecordQuery);
  1685 + if (CollectionUtils.isNotEmpty(recordModels))
  1686 + {
  1687 + AntExRecordModel model1 = recordModels.get(0);
  1688 + model1.setNextCheckTime(DateUtil.parseYMD(nextTime));
  1689 + model1.setCheckDoctor(doctorId);
  1690 + recordService.updateOne(model1,model1.getId());
  1691 + }
  1692 + }
  1693 +
  1694 +
1679 1695 falg = false;
1680 1696 break;
1681 1697 }
... ... @@ -1882,7 +1898,10 @@
1882 1898 for (AntenatalExaminationModel model : examinationModel) {
1883 1899 if (StringUtils.isNotEmpty(DateUtil.getyyyy_MM_dd(model.getCheckDate())) &&
1884 1900 DateUtil.getyyyy_MM_dd(new Date()).equals(DateUtil.getyyyy_MM_dd(model.getCheckDate()))) {
1885   - model.setWeight(Double.parseDouble(nutritionInfoRequest.getCurrentWeight()));
  1901 + if (StringUtils.isNotEmpty(nutritionInfoRequest.getCurrentWeight()) && !"null".equals(nutritionInfoRequest.getCurrentWeight()))
  1902 + {
  1903 + model.setWeight(Double.parseDouble(nutritionInfoRequest.getCurrentWeight()));
  1904 + }
1886 1905 if (StringUtils.isNotEmpty(nutritionInfoRequest.getSsy()) && StringUtils.isNotEmpty(nutritionInfoRequest.getSzy()))
1887 1906 {
1888 1907 Map map = new HashMap();
... ... @@ -1923,6 +1942,41 @@
1923 1942 if (CollectionUtils.isNotEmpty(antExChuModels)) {
1924 1943  
1925 1944 AntExAddRequest antExAddRequest = new AntExAddRequest();
  1945 +
  1946 + /**
  1947 + * 0周至19周预约到 24周的日期
  1948 + 20周至24周预约到 28周的日期
  1949 + 25周至28周预约到 30周的日期
  1950 + 28周至35周预约到 两周后的日期
  1951 + 36周后 预约到 一周后的日期
  1952 + */
  1953 +
  1954 + String nextCheckTime = null;
  1955 + int week = DateUtil.getWeek2(patients.getLastMenses(),new Date());
  1956 + if (week <= 19)
  1957 + {
  1958 + nextCheckTime = DateUtil.getyyyy_MM_dd(DateUtil.addWeek(patients.getLastMenses(),24));
  1959 + }
  1960 + else if (week >= 20 && week <= 24)
  1961 + {
  1962 + nextCheckTime = DateUtil.getyyyy_MM_dd(DateUtil.addWeek(patients.getLastMenses(),28));
  1963 + }
  1964 + else if (week >= 25 && week <= 28)
  1965 + {
  1966 + nextCheckTime = DateUtil.getyyyy_MM_dd(DateUtil.addWeek(patients.getLastMenses(),30));
  1967 + }
  1968 + else if (week > 28 && week <= 35)
  1969 + {
  1970 + nextCheckTime = DateUtil.getyyyy_MM_dd(DateUtil.addWeek(patients.getLastMenses(),week+2));
  1971 + }
  1972 + else if (week >= 36)
  1973 + {
  1974 + nextCheckTime = DateUtil.getyyyy_MM_dd(DateUtil.addWeek(patients.getLastMenses(),week+1));
  1975 + }
  1976 + if (nextCheckTime != null)
  1977 + {
  1978 + antExAddRequest.setNextCheckTime(nextCheckTime);
  1979 + }
1926 1980 antExAddRequest.setCheckDate(DateUtil.getyyyy_MM_dd(new Date()));
1927 1981 antExAddRequest.setDiagnosisOther(DateUtil.getWeekDesc(patients.getLastMenses(), new Date()));// diagnosisOther: "29+4周妊娠 "
1928 1982 antExAddRequest.setCurrentDueDate(DateUtil.getWeekDesc(patients.getLastMenses(), new Date()));//currentDueDate: "孕29周+4天"
1929 1983  
... ... @@ -1947,8 +2001,12 @@
1947 2001 antExAddRequest.setOtherRisk(maps);
1948 2002 }
1949 2003 antExAddRequest.setRiskFactor(patients.getRiskFactorId());
1950   - antExAddRequest.setWeight(Double.parseDouble(nutritionInfoRequest.getCurrentWeight()));
1951 2004  
  2005 + if (StringUtils.isNotEmpty(nutritionInfoRequest.getCurrentWeight()) && !"null".equals(nutritionInfoRequest.getCurrentWeight()))
  2006 + {
  2007 + antExAddRequest.setWeight(Double.parseDouble(nutritionInfoRequest.getCurrentWeight()));
  2008 + }
  2009 +
1952 2010 antExAddRequest.setTireNumber(nutritionInfoRequest.getTireNumber());
1953 2011 GuidelinesQuery guidelinesQuery = new GuidelinesQuery();
1954 2012 guidelinesQuery.setType(1);
... ... @@ -1983,10 +2041,12 @@
1983 2041 }
1984 2042 else
1985 2043 {
1986   - Map mapBp = new HashMap();
1987   - mapBp.put("ssy", nutritionInfoRequest.getSsy());
1988   - mapBp.put("szy", nutritionInfoRequest.getSzy());
1989   - antExAddRequest.setBp(mapBp);
  2044 + if (StringUtils.isNotEmpty(nutritionInfoRequest.getSsy()) && StringUtils.isNotEmpty(nutritionInfoRequest.getSzy())) {
  2045 + Map mapBp = new HashMap();
  2046 + mapBp.put("ssy", nutritionInfoRequest.getSsy());
  2047 + mapBp.put("szy", nutritionInfoRequest.getSzy());
  2048 + antExAddRequest.setBp(mapBp);
  2049 + }
1990 2050 }
1991 2051  
1992 2052 UsersQuery query = new UsersQuery();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java View file @ 9c98ef3
... ... @@ -1162,7 +1162,7 @@
1162 1162 temp.put("timestamp", DateUtil.getyyyy_MM_dd_hms(new Date()));
1163 1163 temp.put("hospitalId", hospitalId);
1164 1164 Patients p = mongoTemplate.findById(bloodPressure.getParentId(), Patients.class);
1165   - nutritionInfoRequest.setPid(p.getPid());
  1165 +
1166 1166 BloodPressure bp = null;
1167 1167 if (p != null) {
1168 1168 bp = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(p.getPid())), BloodPressure.class);
... ... @@ -1188,7 +1188,7 @@
1188 1188 bloodPressure.setPid(bp.getPid());
1189 1189 bloodPressureService.update(bloodPressure);
1190 1190 }
1191   -
  1191 + nutritionInfoRequest.setPid(p.getPid());
1192 1192 boolean isInput = false;
1193 1193 //初诊自动填写血压
1194 1194 List<AntExChuModel> antExChuModels = mongoTemplate.find(Query.query(Criteria.where("pid").is(p.getPid()).and("yn").is(YnEnums.YES.getId())), AntExChuModel.class);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ 9c98ef3
... ... @@ -771,11 +771,15 @@
771 771 Query query = Query.query(Criteria.where("hospitalId").is(hospital).and("yn").ne("0"));
772 772 String formatBmi = "";
773 773 if ("1".equals(riskPatientsQueryRequest.getBmi())) {
774   - formatBmi = String.format("function () { return this.bmi >= %s && this.bmi <= %s; }", "25", "28");
  774 + formatBmi = String.format("function () { return this.bmi >= %s && this.bmi < %s; }", "25", "28");
775 775 } else if ("2".equals(riskPatientsQueryRequest.getBmi())) {
776   - formatBmi = String.format("function () { return this.bmi >= %s; }", "28");
777   - } else {
778   - formatBmi = String.format("function () { return this.bmi >= %s; }", "25");
  776 + formatBmi = String.format("function () { return this.bmi >= %s && this.bmi < %s; }", "28", "30");
  777 + } else if ("3".equals(riskPatientsQueryRequest.getBmi())) {
  778 + formatBmi = String.format("function () { return this.bmi >= %s && this.bmi < %s; }", "30", "35");
  779 + } else if ("4".equals(riskPatientsQueryRequest.getBmi())) {
  780 + formatBmi = String.format("function () { return this.bmi >= %s && this.bmi < %s; }", "35", "40");
  781 + } else if ("5".equals(riskPatientsQueryRequest.getBmi())) {
  782 + formatBmi = String.format("function () { return this.bmi > %s; }", "40");
779 783 }
780 784 query.addCriteria(Criteria.where("$where").is(formatBmi));
781 785 PageResult pageResult = findMongoPage(PatientWeight.class, query.with(new Sort(Sort.Direction.DESC, "modified")), riskPatientsQueryRequest.getPage(), riskPatientsQueryRequest.getLimit());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java View file @ 9c98ef3
... ... @@ -1199,17 +1199,25 @@
1199 1199 if (antExChuModel != null) {
1200 1200 temp.put("cjDate", DateUtil.getyyyy_MM_dd(antExChuModel.getCheckTime())); /** 产检日期 */
1201 1201 // if (downRecord.getTrackType() == TrackDownDateEnums.C.getId() || downRecord.getTrackType() == TrackDownDateEnums.I.getId()) {//产检追访查询预约产检日期
1202   - if (antExChuModel.getNextCheckTime() != null) {
1203   - temp.put("yyTime", DateUtil.getyyyy_MM_dd(downRecord.getNextCheckTime())); /** 预约产检日期 */
1204   - int days = DateUtil.getDays(downRecord.getNextCheckTime(), new Date());
1205   - temp.put("yyTimeDays", days); /** 预约逾期天数 */
1206   - }
  1202 +// if (antExChuModel.getNextCheckTime() != null) {
  1203 +// temp.put("yyTime", DateUtil.getyyyy_MM_dd(downRecord.getNextCheckTime())); /** 预约产检日期 */
  1204 +// int days = DateUtil.getDays(downRecord.getNextCheckTime(), new Date());
  1205 +// temp.put("yyTimeDays", days); /** 预约逾期天数 */
  1206 +// }
1207 1207 //}
1208   - } else {
1209   - temp.put("yyTime", "--");
1210   - temp.put("yyTimeDays", "--");
1211 1208 }
1212 1209 }
  1210 +
  1211 + if (downRecord.getNextCheckTime() != null)
  1212 + {
  1213 + temp.put("yyTime", DateUtil.getyyyy_MM_dd(downRecord.getNextCheckTime())); /** 预约产检日期 */
  1214 + int days = DateUtil.getDays(downRecord.getNextCheckTime(), new Date());
  1215 + temp.put("yyTimeDays", days); /** 预约逾期天数 */
  1216 + } else {
  1217 + temp.put("yyTime", "--");
  1218 + temp.put("yyTimeDays", "--");
  1219 + }
  1220 +
1213 1221  
1214 1222 //如果是产筛追访列表，查询产筛预约时间
1215 1223 if (downRecord.getTrackType() == TrackDownDateEnums.D.getId() || downRecord.getTrackType() == TrackDownDateEnums.H.getId()) {//产前筛查