jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 4475e01a854d9df74b8eb33adabaaee6198f26e5

Authored by jiangjiazhi
2 parents 15a2edfa86 35850ae988
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 2 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 4475e01
... ... @@ -260,7 +260,7 @@
260 260 AntenatalExaminationModel[] exData = new AntenatalExaminationModel[4];
261 261 AntenatalExaminationModel antenatalExaminationModel = antExService.findOneById(id);
262 262 Patients patients = patientsService.findOnePatientById(antenatalExaminationModel.getParentId());
263   - if (num < 3) {
  263 + if (num < 4) {
264 264 exData[num - 1] = antenatalExaminationModel;
265 265 } else {//全部
266 266 String patientsId = antenatalExaminationModel.getParentId();
... ... @@ -274,7 +274,6 @@
274 274 exData[1] = list.get(1);
275 275 exData[2] = list.get(2);
276 276 exData[3] = list.get(3);
277   -
278 277 }
279 278  
280 279 // Map<String, Object> map = new HashMap<>();
... ... @@ -429,10 +428,15 @@
429 428 map.put("hPhone", patients.getHusbandPhone());
430 429 }
431 430  
432   -
433   - map.put("yNum", data.getPregnancyTimes());
434   - map.put("fNum", data.getDelivery());
435   - map.put("pNum", data.getPlanedProd());
  431 + if (data.getPregnancyTimes() != null) {
  432 + map.put("yNum", data.getPregnancyTimes());
  433 + }
  434 + if (data.getDelivery() != null) {
  435 + map.put("fNum", data.getDelivery());
  436 + }
  437 + if (data.getPlanedProd() != null) {
  438 + map.put("pNum", data.getPlanedProd());
  439 + }
436 440 if (data.getLastMenses() != null) {
437 441 Calendar lastCal = Calendar.getInstance();
438 442 lastCal.setTime(data.getLastMenses());
... ... @@ -945,12 +949,12 @@
945 949 /* 初诊信息 */
946 950  
947 951  
948   - map.put("zyqbdjc", Boolean.valueOf(data.getZyqbd())?"已检查":"未检查");
949   - map.put("ntjc", Boolean.valueOf(data.getNtjc())?"已检查":"未检查");
950   - map.put("cjsc", Boolean.valueOf(data.getCjsc())?"已检查":"未检查");
951   - map.put("textpjbc", Boolean.valueOf(data.getTextpjbc())?"已检查":"未检查");
952   - map.put("s75gdgtt",Boolean.valueOf( data.getS75gdgtt())?"已检查":"未检查");
953   - map.put("jzxgn", Boolean.valueOf(data.getJzxgn())?"已检查":"未检查");
  952 + map.put("zyqbdjc", Boolean.valueOf(data.getZyqbd()) ? "已检查" : "未检查");
  953 + map.put("ntjc", Boolean.valueOf(data.getNtjc()) ? "已检查" : "未检查");
  954 + map.put("cjsc", Boolean.valueOf(data.getCjsc()) ? "已检查" : "未检查");
  955 + map.put("textpjbc", Boolean.valueOf(data.getTextpjbc()) ? "已检查" : "未检查");
  956 + map.put("s75gdgtt", Boolean.valueOf(data.getS75gdgtt()) ? "已检查" : "未检查");
  957 + map.put("jzxgn", Boolean.valueOf(data.getJzxgn()) ? "已检查" : "未检查");
954 958 //既往史
955 959 String pastHistory = "";
956 960 if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getPastHistory())) {
957 961  
... ... @@ -1028,13 +1032,11 @@
1028 1032 map.put("gongwaiyun", UnitUtils.unitSplice(data.getGongwaiyun(), UnitConstants.CI));
1029 1033 //流产
1030 1034 StringBuffer abortion = new StringBuffer();
1031   - if (data.getAbortion() != null)
1032   - {
  1035 + if (data.getAbortion() != null) {
1033 1036 boolean isAppend = false;
1034 1037 abortion.append(UnitUtils.unitSplice(data.getAbortion(), UnitConstants.CI) == null ? "" : UnitUtils.unitSplice(data.getAbortion(), UnitConstants.CI));
1035   - if (data.getAbortionZR() != null || data.getAbortionRG() != null || data.getYaowu() != null)
1036   - {
1037   - isAppend = true;
  1038 + if (data.getAbortionZR() != null || data.getAbortionRG() != null || data.getYaowu() != null) {
  1039 + isAppend = true;
1038 1040 abortion.append("（");
1039 1041 }
1040 1042 if (data.getAbortionZR() != null) {
... ... @@ -1048,8 +1050,7 @@
1048 1050 if (data.getYaowu() != null) {
1049 1051 abortion.append(" 药物:" + data.getYaowu() + UnitConstants.CI + "");
1050 1052 }
1051   - if (isAppend)
1052   - {
  1053 + if (isAppend) {
1053 1054 abortion.append("）");
1054 1055 }
1055 1056  
... ... @@ -1172,7 +1173,7 @@
1172 1173 }
1173 1174  
1174 1175 if ("java.util.LinkedHashMap".equals(obj.getClass().getName())) {
1175   - Map<String, Object> placenta = (Map<String, Object>)obj;
  1176 + Map<String, Object> placenta = (Map<String, Object>) obj;
1176 1177 if (MapUtils.isNotEmpty(placenta)) {
1177 1178 if (placenta.get("fetalPosition") != null) {
1178 1179 for (FetalPositionEnums fetalPositionEnums : FetalPositionEnums.values()) {
1179 1180  
1180 1181  
1181 1182  
1182 1183  
... ... @@ -1190,22 +1191,22 @@
1190 1191 fetalPresentation += placenta.get("fetalPresentation") == null ? "" : placenta.get("fetalPresentation");
1191 1192 join = String.valueOf(placenta.get("join"));
1192 1193  
1193   - if (placenta.get("xlwz")!=null) {
  1194 + if (placenta.get("xlwz") != null) {
1194 1195 placetaMap.put("xlwz", GongJingEnums.getXLWeiZhiNameById(String.valueOf(placenta.get("xlwz"))));
1195 1196 }
1196   - if (placenta.get("gjwz")!=null) {
  1197 + if (placenta.get("gjwz") != null) {
1197 1198 placetaMap.put("gjwz", GongJingEnums.getWeiZhiNameById(String.valueOf(placenta.get("gjwz"))));
1198 1199 }
1199 1200  
1200   - if (placenta.get("gjyd")!=null) {
  1201 + if (placenta.get("gjyd") != null) {
1201 1202 placetaMap.put("gjyd", GongJingEnums.getYinDuNameById(String.valueOf(placenta.get("gjyd"))));
1202 1203 }
1203 1204  
1204   - if (placenta.get("tm")!=null) {
  1205 + if (placenta.get("tm") != null) {
1205 1206 placetaMap.put("tm", TaiShuEnums.getTmNameById(String.valueOf(placenta.get("tm"))));
1206 1207 }
1207 1208  
1208   - if (placenta.get("ydjc")!=null) {
  1209 + if (placenta.get("ydjc") != null) {
1209 1210 placetaMap.put("ydjc", GongJingEnums.getYDJianCeNameById(String.valueOf(placenta.get("ydjc"))));
1210 1211 }
1211 1212  
1212 1213  
... ... @@ -1217,11 +1218,11 @@
1217 1218 placetaMap.put("gjrs", UnitUtils.unitSplice(placenta.get("gjrs"), UnitConstants.BF));
1218 1219 }
1219 1220  
1220   - if (placenta.get("gjwzOther")!=null) {
  1221 + if (placenta.get("gjwzOther") != null) {
1221 1222 placetaMap.put("gjwzOther", placenta.get("gjwzOther"));
1222 1223 }
1223 1224  
1224   - if (placenta.get("gjydOther")!=null) {
  1225 + if (placenta.get("gjydOther") != null) {
1225 1226 placetaMap.put("gjydOther", placenta.get("gjydOther"));
1226 1227 }
1227 1228  
... ... @@ -1276,7 +1277,7 @@
1276 1277 map.put("syjg", FunvCommonUtil.checkYiGan(data.getSyjg()));
1277 1278 map.put("hivkt", FunvCommonUtil.checkYiGan(data.getHivkt()));
1278 1279  
1279   - map.put("cjzxs",data.getCjzxs());//促甲状腺素
  1280 + map.put("cjzxs", data.getCjzxs());//促甲状腺素
1280 1281 map.put("yljzxs", data.getYljzxs());//游离甲状腺素
1281 1282 map.put("jzxgyhwmkt", data.getJzxgyhwmkt());//甲状腺过氧化物酶抗体
1282 1283  
... ... @@ -1400,12 +1401,12 @@
1400 1401 map.put("checkDate", DateUtil.getyyyy_MM_dd(data.getCheckDate()));
1401 1402 map.put("currentDueDate", ResolveUtils.getPregnancyWeek(patients.getLastMenses(), data.getCheckDate()));
1402 1403  
1403   - map.put("zyqbdjc", Boolean.valueOf(data.getZyqbd())?"已检查":"未检查");
1404   - map.put("ntjc", Boolean.valueOf(data.getNtjc())?"已检查":"未检查");
1405   - map.put("cjsc", Boolean.valueOf(data.getCjsc())?"已检查":"未检查");
1406   - map.put("textpjbc", Boolean.valueOf(data.getTextpjbc())?"已检查":"未检查");
1407   - map.put("s75gdgtt",Boolean.valueOf( data.getS75gdgtt())?"已检查":"未检查");
1408   - map.put("jzxgn", Boolean.valueOf(data.getJzxgn())?"已检查":"未检查");
  1404 + map.put("zyqbdjc", Boolean.valueOf(data.getZyqbd()) ? "已检查" : "未检查");
  1405 + map.put("ntjc", Boolean.valueOf(data.getNtjc()) ? "已检查" : "未检查");
  1406 + map.put("cjsc", Boolean.valueOf(data.getCjsc()) ? "已检查" : "未检查");
  1407 + map.put("textpjbc", Boolean.valueOf(data.getTextpjbc()) ? "已检查" : "未检查");
  1408 + map.put("s75gdgtt", Boolean.valueOf(data.getS75gdgtt()) ? "已检查" : "未检查");
  1409 + map.put("jzxgn", Boolean.valueOf(data.getJzxgn()) ? "已检查" : "未检查");
1409 1410  
1410 1411 //早孕期病毒检测
1411 1412 // private String zyqbdjc;
... ... @@ -1458,6 +1459,16 @@
1458 1459 }
1459 1460 map.put("bp", UnitUtils.unitSplice(ssy + "/" + szy, UnitConstants.MMHG));
1460 1461 map.put("gongGao", UnitUtils.unitSplice(data.getGongGao(), UnitConstants.CM));
  1462 +
  1463 + if (StringUtils.isNotEmpty(data.getGongGaoSelect())) {
  1464 + map.put("gongGaoSelect", GongJingEnums.getGongGaoNameById(data.getGongGaoSelect()));
  1465 + }
  1466 +
  1467 + if (StringUtils.isNotEmpty(data.getGongGaoType())) {
  1468 + map.put("gongGaoType", GongJingEnums.getHengZhiNameById(data.getGongGaoType()));
  1469 + }
  1470 +
  1471 +
1461 1472 map.put("abdominalCircumference", UnitUtils.unitSplice(data.getAbdominalCircumference(), UnitConstants.CM));
1462 1473 String edema = "";
1463 1474 if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getEdema())) {
... ... @@ -1486,6 +1497,44 @@
1486 1497 tireMap.put("fetalPosition", FetalPositionEnums.getTitle(fetalPosition));
1487 1498 tireMap.put("fetalPresentation", FetalEnums.getTitle(fetalPresentation));
1488 1499 tireMap.put("join", JoinEnums.getTitle(join));
  1500 + if (tire.get("xlwz") != null) {
  1501 + tireMap.put("xlwz", GongJingEnums.getXLWeiZhiNameById(String.valueOf(tire.get("xlwz"))));
  1502 + }
  1503 + if (tire.get("gjwz") != null) {
  1504 + tireMap.put("gjwz", GongJingEnums.getWeiZhiNameById(String.valueOf(tire.get("gjwz"))));
  1505 + }
  1506 +
  1507 + if (tire.get("gjyd") != null) {
  1508 + tireMap.put("gjyd", GongJingEnums.getYinDuNameById(String.valueOf(tire.get("gjyd"))));
  1509 + }
  1510 +
  1511 + if (tire.get("tm") != null) {
  1512 + tireMap.put("tm", TaiShuEnums.getTmNameById(String.valueOf(tire.get("tm"))));
  1513 + }
  1514 +
  1515 + if (tire.get("ydjc") != null) {
  1516 + tireMap.put("ydjc", GongJingEnums.getYDJianCeNameById(String.valueOf(tire.get("ydjc"))));
  1517 + }
  1518 +
  1519 + if (tire.get("gjkd") != null) {
  1520 + tireMap.put("gjkd", UnitUtils.unitSplice(tire.get("gjkd"), UnitConstants.CM));
  1521 + }
  1522 +
  1523 + if (tire.get("gjrs") != null) {
  1524 + tireMap.put("gjrs", UnitUtils.unitSplice(tire.get("gjrs"), UnitConstants.BF));
  1525 + }
  1526 +
  1527 + if (tire.get("gjwzOther") != null) {
  1528 + tireMap.put("gjwzOther", tire.get("gjwzOther"));
  1529 + }
  1530 +
  1531 + if (tire.get("gjydOther") != null) {
  1532 + tireMap.put("gjydOther", tire.get("gjydOther"));
  1533 + }
  1534 +
  1535 + if (tire.get("yszs") != null) {
  1536 + tireMap.put("yszs", UnitUtils.unitSplice(tire.get("yszs"), UnitConstants.CM));
  1537 + }
1489 1538 tireList.add(tireMap);
1490 1539 }
1491 1540 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java View file @ 4475e01
... ... @@ -1069,7 +1069,6 @@
1069 1069 @Override
1070 1070 public BaseObjectResponse patient(Integer userId, String year, String provinceId, String cityId, String areaId) {
1071 1071 String hospitalId = autoMatchFacade.getHospitalId(userId);
1072   -
1073 1072 Set<String> patientIds = new HashSet<>();
1074 1073  
1075 1074 /*Criteria criteria = Criteria.where("created").gte(DateUtil.getYearDate(year))
1076 1075  
1077 1076  
... ... @@ -1115,11 +1114,20 @@
1115 1114 }
1116 1115  
1117 1116 /** 增加年份条件限制 */
1118   - criteria = Criteria.where("created").gte(DateUtil.getYearDate(year))
  1117 + criteria = Criteria.where("bookbuildingDate").gte(DateUtil.getYearDate(year))
1119 1118 .lt(DateUtil.getNextYearDate(year))
1120 1119 .and("hospitalId").is(hospitalId);
  1120 +
1121 1121 if(StringUtils.isNotEmpty(provinceId)) {
1122 1122 criteria.and("provinceId").in(CollectionUtils.asList(provinceId));
  1123 + }
  1124 +
  1125 + if(StringUtils.isNotEmpty(cityId)) {
  1126 + criteria.and("cityId").in(CollectionUtils.asList(cityId));
  1127 + }
  1128 +
  1129 + if(StringUtils.isNotEmpty(areaId)) {
  1130 + criteria.and("areaId").in(CollectionUtils.asList(areaId));
1123 1131 }
1124 1132  
1125 1133 List<Patients> patients = mongoTemplate.find(Query.query(criteria), Patients.class);