jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 74ad7ac495dd786137f8a497ad3778eae0a08c31

Authored by liquanyu
2 parents 9998cff25c aef0233cb7
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 4 changed files

platform-common/src/main/java/com/lyms/platform/common/enums/QiDaiEnums.java View file @ 74ad7ac
... ... @@ -13,6 +13,7 @@
13 13  
14 14 O6("脐带扭转", "5"),
15 15 O7("脐带脱垂", "6"),
  16 + O0("脐带脱落", "9"),
16 17 O8("脐带绕颈", "7"),
17 18 O9("脐带绕体", "8");
18 19  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ 74ad7ac
... ... @@ -1090,7 +1090,7 @@
1090 1090 data.put("san",rp.getSan());
1091 1091 data.put("si",rp.getSi());
1092 1092 data.put("wu",rp.getWu());
1093   - data.put("total", rp.getcTimes());
  1093 + data.put("total", rp.getCjTimes());
1094 1094 data.put("cyxj",rp.getCyxj());
1095 1095 data.put("chfs",rp.getChfs());
1096 1096 data.put("chfc",rp.getChfc());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java View file @ 74ad7ac
... ... @@ -88,10 +88,12 @@
88 88 chanResult.setSi("-");
89 89 chanResult.setWu("-");
90 90 chanResult.convertToResult(patients);
91   - antExQuery.setParentId(patients.getId());
  91 + //antExQuery.setParentId(patients.getId());
  92 + antExQuery.setPid(patients.getPid());
92 93 antExQuery.setYn(YnEnums.YES.getId());
93 94 //初诊查询
94 95 antExChuQuery1.setPid(patients.getPid());
  96 + //antExChuQuery1.setParentId(patients.getId());
95 97 //增加查询本次产程条数
96 98 antExChuQuery1.setStart(patients.getLastMenses());
97 99 List<AntExChuModel> chu = antExService.queryAntExChu(antExChuQuery1.convertToQuery());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanPatientWorker.java View file @ 74ad7ac
... ... @@ -102,6 +102,7 @@
102 102 quanPatientsResult.setbTime(DateUtil.getyyyy_MM_dd(patients.getBookbuildingDate()));
103 103 stopWatch.start("query ant count");
104 104 antExChuQuery1.setPid(patients.getPid());
  105 + //antExChuQuery1.setParentId(patients.getId());
105 106 //增加查询本次产程条数
106 107 antExChuQuery1.setStart(patients.getLastMenses());
107 108 List<AntExChuModel> chu = antExService.queryAntExChu(antExChuQuery1.convertToQuery());