jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 75931adacc4d3a41f4e76327cb1131437e99ea96

Authored by jiangjiazhi
2 parents d050624ceb c5b1ea1692
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 6 changed files

platform-dal/src/main/java/com/lyms/platform/query/StopPregQuery.java View file @ 75931ad
... ... @@ -102,6 +102,10 @@
102 102 if (null!= hospitalId) {
103 103 condition = condition.and("hospitalId", hospitalId, MongoOper.IS);
104 104 }
  105 +
  106 + if (null!= stopDate) {
  107 + condition = condition.and("stopDate", stopDate, MongoOper.IS);
  108 + }
105 109 Criteria c=null;
106 110 Boolean isAddStart = Boolean.FALSE;
107 111 if (null != stopDateStart) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java View file @ 75931ad
... ... @@ -146,6 +146,7 @@
146 146 highRisks.put("f50206fe-5fe4-4831-be7b-506ab0b458ed", "63347e70-4a74-4bc9-bad6-0c0cf1b2fd89"); //严重心律失常 ---严重心血管系统疾病
147 147 highRisks.put("e04d5364-11da-45f6-9801-c50ad5eb6f27", "63347e70-4a74-4bc9-bad6-0c0cf1b2fd89"); //严重心律失常 ---严重心血管系统疾病
148 148 highRisks.put("4ec114d7-9c78-4dfc-878c-1139ef3ff04c", "5a40c73c422b03d4ad2bf7bf"); //骨盆狭窄或产道畸形，--- 生殖道畸形和骨盆狭小
  149 + highRisks.put("3af4b6fd-0bb9-4f4b-9d8f-916df71955cf", "5a430fe4422b03d4ad2bf82b"); //胸廓畸形伴轻度肺功能不全---- 胸廓畸形等伴轻度肺功能不全
149 150 }
150 151  
151 152 @ResponseBody
152 153  
... ... @@ -191,8 +192,9 @@
191 192 */
192 193 @RequestMapping(value = "/synAntexcOtherHighRisk", method = RequestMethod.GET)
193 194 @ResponseBody
194   - public BaseResponse synAntexcOtherHighRisk() {
  195 + public BaseResponse synAntexcOtherHighRisk(@RequestParam(required = false) String hospitalId) {
195 196 AntExChuQuery antExChuQuery1 = new AntExChuQuery();
  197 + antExChuQuery1.setHospitalId(hospitalId);
196 198 antExChuQuery1.setOtherHighRisk("{}");
197 199 int patientCount = antenatalExaminationService.queryAntExChuCount(antExChuQuery1.convertToQuery());
198 200 System.out.println("一共需要处理数据量：" + patientCount);
199 201  
... ... @@ -210,8 +212,9 @@
210 212 */
211 213 @RequestMapping(value = "/synAntexOtherHighRisk", method = RequestMethod.GET)
212 214 @ResponseBody
213   - public BaseResponse synAntexOtherHighRisk() {
  215 + public BaseResponse synAntexOtherHighRisk(@RequestParam(required = false) String hospitalId) {
214 216 AntExQuery antExQuery = new AntExQuery();
  217 + antExQuery.setHospitalId(hospitalId);
215 218 antExQuery.setOtherRisk("{}");
216 219 int patientCount = antenatalExaminationService.queryAntenatalExaminationCount(antExQuery.convertToQuery());
217 220 System.out.println("一共需要处理数据量：" + patientCount);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java View file @ 75931ad
... ... @@ -176,6 +176,7 @@
176 176 List<Integer> typeList = new ArrayList<>();
177 177 typeList.add(1);
178 178 typeList.add(3);
  179 + patientsQuery.setDueStatus(0);
179 180 patientsQuery.setBuildTypeNot(1);
180 181 // patientsQuery.setHospitalId(autoMatchFacade.getHospitalId(dischargeAbstractSaveRequest.getOperatorId()));
181 182 patientsQuery.setTypeList(typeList);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java View file @ 75931ad
... ... @@ -256,7 +256,7 @@
256 256 bs.setRiskCount(bs.getRiskCount() + basicConfig.getRiskCount());
257 257  
258 258 df = new DecimalFormat("0.00");
259   - percent =basicConfig.getRiskCount() > 0 ? df.format((double) basicConfig.getRiskCount() / allPatientCount * 100) + "%" : "0%";
  259 + percent =bs.getRiskCount() > 0 ? df.format((double) bs.getRiskCount() / allPatientCount * 100) + "%" : "0%";
260 260 bs.setPercent(percent);
261 261 }
262 262 bs.setRiskReportResults(null);
... ... @@ -277,7 +277,8 @@
277 277 risk.setRiskCount(riskPatientCount);
278 278  
279 279 DecimalFormat df = new DecimalFormat("0.00");
280   - String percent =riskPatientCount>0? df.format((double) riskPatientCount / allPatientCount * 100) + "%":"0%";
  280 + //肖进：其他高危发病率=其他高危+国家高危人数/其他高危人数
  281 + String percent =riskPatientCount>0? df.format((double) riskPatientCount / (allPatientCount+riskPatientCount) * 100) + "%":"0%";
281 282 risk.setPercent(percent);
282 283  
283 284 List level = new ArrayList();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java View file @ 75931ad
... ... @@ -8,6 +8,7 @@
8 8 import com.lyms.platform.pojo.AntenatalExaminationModel;
9 9 import scala.actors.threadpool.Arrays;
10 10  
  11 +import java.util.Iterator;
11 12 import java.util.List;
12 13 import java.util.Map;
13 14  
14 15  
15 16  
... ... @@ -374,14 +375,22 @@
374 375 if (StringUtils.isNotEmpty(destModel.getOtherRisk()) && !"{}".equals(destModel.getOtherRisk()) && !"[]".equals(destModel.getOtherRisk())) {
375 376 if (destModel.getOtherRisk().startsWith("[") && destModel.getOtherRisk().endsWith("]")) {
376 377 List<Map> list2 = JsonUtil.toList(destModel.getOtherRisk(), Map.class);
377   - for (Map map : list2) {
  378 + Iterator<Map> listIterator = list2.iterator();
  379 + while (listIterator.hasNext()){
  380 + Map map = listIterator.next();
378 381 suppleOtherHigh(map);
  382 + if(map.isEmpty()){
  383 + listIterator.remove();
  384 + }
379 385 }
380 386 setOtherRisk(list2);
381 387 } else if(org.apache.commons.lang.StringUtils.isNotEmpty(destModel.getOtherRisk())){
382 388 Map map = JsonUtil.str2Obj(destModel.getOtherRisk(), Map.class);
383 389 suppleOtherHigh(map);
384   - setOtherRisk(Arrays.asList(new Object[]{map}));
  390 + if(!map.isEmpty()){
  391 + setOtherRisk(Arrays.asList(new Object[]{map}));
  392 + }
  393 +
385 394 }
386 395 }
387 396 } catch (Exception e) {
388 397  
... ... @@ -407,11 +416,15 @@
407 416 Object idObj1 = map.get("fyyse");
408 417 if (null != idObj1 && !"null".equals(idObj1.toString()) && !"".equals(idObj1.toString())) {
409 418 map.put("color", HosptialHighRiskFacade.colorMap.get(idObj1));
  419 + }else{
  420 + map.remove("fyyse");
410 421 }
411 422 //风险评分
412 423 Object idObj = map.get("fxpf");
413 424 if (null != idObj && !"null".equals(idObj.toString()) && !"".equals(idObj.toString())) {
414 425 map.put("scoer", HosptialHighRiskFacade.scoreMap.get(idObj));
  426 + }else {
  427 + map.remove("fxpf");
415 428 }
416 429 }
417 430 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java View file @ 75931ad
... ... @@ -9,6 +9,7 @@
9 9 import com.lyms.platform.pojo.AntExChuModel;
10 10 import scala.actors.threadpool.Arrays;
11 11  
  12 +import java.util.Iterator;
12 13 import java.util.List;
13 14 import java.util.Map;
14 15  
15 16  
16 17  
... ... @@ -60,12 +61,18 @@
60 61 this.mHighRiskReason = mHighRiskReason;
61 62 }
62 63  
63   - /** 处理意见 */
  64 + /**
  65 + * 处理意见
  66 + */
64 67 private Map<String, List<Map<String, Object>>> treatmentOpinion2;
65 68 private List<String> treatmentOpinion2Types;
66   - /** 胎动 */
  69 + /**
  70 + * 胎动
  71 + */
67 72 private String quicken;
68   - /** 胎动备注 */
  73 + /**
  74 + * 胎动备注
  75 + */
69 76 private String quickenRemark;
70 77  
71 78 public String getQuicken() {
... ... @@ -99,6 +106,7 @@
99 106 public void setTreatmentOpinion2Types(List<String> treatmentOpinion2Types) {
100 107 this.treatmentOpinion2Types = treatmentOpinion2Types;
101 108 }
  109 +
102 110 private String barCode;
103 111  
104 112 public String getBarCode() {
... ... @@ -641,7 +649,6 @@
641 649 }
642 650  
643 651  
644   -
645 652 public String getBld() {
646 653 return bld;
647 654 }
... ... @@ -804,7 +811,6 @@
804 811 }
805 812  
806 813  
807   -
808 814 public String getNcgOther() {
809 815 return ncgOther;
810 816 }
... ... @@ -1353,8 +1359,8 @@
1353 1359 setYsfyHistory(JsonUtil.str2Obj(antExChuModel.getYsfyHistory(), Map.class));
1354 1360 } catch (Exception e) {
1355 1361 }
1356   - if(null!=antExChuModel.getBp()){
1357   - setBp(JsonUtil.str2Obj(antExChuModel.getBp(),Map.class));
  1362 + if (null != antExChuModel.getBp()) {
  1363 + setBp(JsonUtil.str2Obj(antExChuModel.getBp(), Map.class));
1358 1364 }
1359 1365 setYaowu(antExChuModel.getYaowu());
1360 1366 setGongwaiyun(antExChuModel.getGongwaiyun());
1361 1367  
1362 1368  
1363 1369  
1364 1370  
... ... @@ -1395,17 +1401,25 @@
1395 1401 setPlacentas(antExChuModel.getPlacentas());
1396 1402 setHighriskSocre(antExChuModel.getHighriskSocre());
1397 1403 //处理成支持多选操作
1398   - if (StringUtils.isNotEmpty(antExChuModel.getOtherHighRisk()) && !"{}".equals(antExChuModel.getOtherHighRisk())&& !"[]".equals(antExChuModel.getOtherHighRisk())) {
  1404 + if (StringUtils.isNotEmpty(antExChuModel.getOtherHighRisk()) && !"{}".equals(antExChuModel.getOtherHighRisk()) && !"[]".equals(antExChuModel.getOtherHighRisk())) {
1399 1405 if (antExChuModel.getOtherHighRisk().startsWith("[") && antExChuModel.getOtherHighRisk().endsWith("]")) {
1400 1406 List<Map> list2 = JsonUtil.toList(antExChuModel.getOtherHighRisk(), Map.class);
1401   - for (Map map : list2) {
  1407 +
  1408 + Iterator<Map> listIterator = list2.iterator();
  1409 + while (listIterator.hasNext()){
  1410 + Map map = listIterator.next();
1402 1411 suppleOtherHigh(map);
  1412 + if(map.isEmpty()){
  1413 + listIterator.remove();
  1414 + }
1403 1415 }
1404 1416 setOtherHighRisk(list2);
1405   - }else{
  1417 + } else {
1406 1418 Map map = JsonUtil.str2Obj(antExChuModel.getOtherHighRisk(), Map.class);
1407 1419 suppleOtherHigh(map);
1408   - setOtherHighRisk(Arrays.asList(new Object[]{map}));
  1420 + if(!map.isEmpty()){
  1421 + setOtherHighRisk(Arrays.asList(new Object[]{map}));
  1422 + }
1409 1423 }
1410 1424 }
1411 1425  
1412 1426  
... ... @@ -1413,10 +1427,10 @@
1413 1427 setTreatOpinion(antExChuModel.getTreatOpinion());
1414 1428 setGuide(antExChuModel.getDirOpinion());
1415 1429 // setProdDoctor(antExChuModel.getProdDoctor());
1416   - if(null!=antExChuModel.getCheckTime()){
  1430 + if (null != antExChuModel.getCheckTime()) {
1417 1431 setCheckTime(DateUtil.getyyyy_MM_dd(antExChuModel.getCheckTime()));
1418 1432 }
1419   - if(null!=antExChuModel.getNextCheckTime()){
  1433 + if (null != antExChuModel.getNextCheckTime()) {
1420 1434 setNextCheckTime(DateUtil.getyyyy_MM_dd(antExChuModel.getNextCheckTime()));
1421 1435 }
1422 1436 setSyjg(antExChuModel.getSyjg());
1423 1437  
... ... @@ -1450,12 +1464,12 @@
1450 1464 setHivkt(antExChuModel.getHivkt());
1451 1465 setYdfmw(JsonUtil.str2Obj(antExChuModel.getYdfmw(), Map.class));
1452 1466 setYdqjd(antExChuModel.getYdqjd());
1453   - if(null!=antExChuModel.getDueDate()){
  1467 + if (null != antExChuModel.getDueDate()) {
1454 1468 setDueDate(DateUtil.getyyyy_MM_dd(antExChuModel.getDueDate()));
1455 1469 }
1456   - if(null!=antExChuModel.getLastMenses()) {
1457   - setLastMenses(DateUtil.getyyyy_MM_dd(antExChuModel.getLastMenses()));
1458   - }
  1470 + if (null != antExChuModel.getLastMenses()) {
  1471 + setLastMenses(DateUtil.getyyyy_MM_dd(antExChuModel.getLastMenses()));
  1472 + }
1459 1473 setcDueWeek(antExChuModel.getcDueWeek());
1460 1474  
1461 1475 setAbortionZR(antExChuModel.getAbortionZR());
1462 1476  
1463 1477  
1464 1478  
... ... @@ -1473,18 +1487,23 @@
1473 1487  
1474 1488 /**
1475 1489 * 完善自定义高危的颜色值，和分数值
  1490 + *
1476 1491 * @param map
1477 1492 */
1478   - public void suppleOtherHigh(Map map){
1479   - if(map!=null){
  1493 + public void suppleOtherHigh(Map map) {
  1494 + if (map != null) {
1480 1495 Object idObj1 = map.get("fyyse");
1481 1496 if (null != idObj1 && !"null".equals(idObj1.toString()) && !"".equals(idObj1.toString())) {
1482 1497 map.put("color", HosptialHighRiskFacade.colorMap.get(idObj1));
  1498 + }else{
  1499 + map.remove("fyyse");
1483 1500 }
1484 1501 //风险评分
1485 1502 Object idObj = map.get("fxpf");
1486 1503 if (null != idObj && !"null".equals(idObj.toString()) && !"".equals(idObj.toString())) {
1487 1504 map.put("scoer", HosptialHighRiskFacade.scoreMap.get(idObj));
  1505 + }else{
  1506 + map.remove("fxpf");
1488 1507 }
1489 1508 }
1490 1509 }