jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 23c338ae5088e61c7bff546a36990e254758d530

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

update

Showing 3 changed files with 24 additions and 6 deletions

platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/Fm.java View file @ 23c338a
... ... @@ -19,6 +19,7 @@
19 19 private Integer FETUS_NUM;//胎数
20 20 private Integer PLACENTA_NUM;//胎盘数
21 21 private String DELIVERY_MODE;//分娩方式
  22 + private String DELIVERY_TYPE;//分娩方式
22 23 private String OPERATION_CAUSE;//手术原因
23 24 private Integer PROD_PROCESS_ONE;//第一产程
24 25 private Integer PROD_PROCESS_TWO;//第二产程
... ... @@ -88,6 +89,14 @@
88 89 private String SBABY_HEIGHT;
89 90  
90 91 private String Vision; //用来判断区域环境分娩调用选择
  92 +
  93 + public String getDELIVERY_TYPE() {
  94 + return DELIVERY_TYPE;
  95 + }
  96 +
  97 + public void setDELIVERY_TYPE(String DELIVERY_TYPE) {
  98 + this.DELIVERY_TYPE = DELIVERY_TYPE;
  99 + }
91 100  
92 101 public String getVision() {
93 102 return Vision;
platform-operate-api/src/main/java/com/lyms/hospitalapi/hs/HsfyFmService.java View file @ 23c338a
... ... @@ -150,6 +150,8 @@
150 150 // " PROD_PROCESS_TWO as PROD_PROCESS_TWO," +
151 151 // " PROD_PROCESS_THREE as PROD_PROCESS_THREE, " +
152 152 // " TOTAL_PROCESS as TOTAL_PROCESS, " +
  153 + " OH_LOSE_BLOOD as OH_LOSE_BLOOD, " +
  154 + " TH_LOSE_BLOOD as TH_LOSE_BLOOD, " +
153 155 " PLACENTA_NUM as PLACENTA_NUM, " +
154 156 " DELIVER_HOSPITAL as DELIVER_HOSPITAL, " +
155 157 " DELIVER_DOCTOR as DELIVER_DOCTOR ";
156 158  
... ... @@ -282,7 +284,14 @@
282 284 int mProcess = Integer.parseInt(allFm.getTOTAL_PROCESS())%60;//总产程分钟数
283 285 totalMap.put("m",String.valueOf(mProcess));
284 286 }
  287 +// // 一小时失血量
  288 +// private Double oHloseBloodL;
  289 +// //二小时失血量
  290 +// private Double tHloseBloodL;
285 291  
  292 + deliverAddRequest.setoHloseBloodL(allFm.getOH_LOSE_BLOOD() == null ? (double)allFm.getOH_LOSE_BLOOD() : null);
  293 + deliverAddRequest.settHloseBloodL(allFm.getTH_LOSE_BLOOD() == null ? (double)allFm.getTH_LOSE_BLOOD() : null);
  294 +
286 295 deliverAddRequest.setProdprocess(map);
287 296 deliverAddRequest.setTotalprocess(totalMap);
288 297 deliverAddRequest.setDeliverDoctor(allFm.getDELIVER_DOCTOR());
289 298  
... ... @@ -296,17 +305,16 @@
296 305 week = allFm.getDUE_WEEK() + "周";
297 306 if (StringUtils.isNotEmpty(allFm.getDUE_WEEK()) && StringUtils.isNotEmpty(allFm.getDUE_DAY()))
298 307 {
299   - week += allFm.getDUE_DAY() + "天";
  308 + week += "+"+allFm.getDUE_DAY() + "天";
300 309 }
301 310  
302 311 deliverAddRequest.setDueWeek(week);
303 312 }
304 313  
305 314 deliverAddRequest.setTireNumber(allFm.getFETUS_NUM());// 胎数(之前赋值为死值1)
306   -// Integer placenta_Num = allFm.getPLACENTA_NUM();
307   -// if(placenta_Num!=null){
308   -// deliverAddRequest.setPlacenta(allFm.getPLACENTA_NUM().toString());// 胎盘(之前赋值为死值1)
309   -// }
  315 + if(allFm.getFETUS_NUM() != null){
  316 + deliverAddRequest.setPlacenta(allFm.getFETUS_NUM()+"");// 胎盘(之前赋值为死值1)
  317 + }
310 318 if ("完整".equals(allFm.getPERINEAL_CONDITION()) || "".equals(allFm.getPERINEAL_CONDITION())) {
311 319 deliverAddRequest.setPerinealCondition("full");
312 320 } else if ("切开".equals(allFm.getPERINEAL_CONDITION()) || "侧切".equals(allFm.getPERINEAL_CONDITION())) {
... ... @@ -388,6 +396,7 @@
388 396 }
389 397  
390 398 baby.setDeformity((allFm.getBABY_DEFORMITY()==null?0:1)); //畸形 0非畸形 1畸形
  399 + baby.setBabyHealthy("良好");
391 400  
392 401 //String baby_Pregnancy_Out = allFm.getBABY_PREGNANCY_OUT();
393 402 // if(baby_Pregnancy_Out!=null && StringUtils.isNotEmpty(baby_Pregnancy_Out)){
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java View file @ 23c338a
... ... @@ -3127,7 +3127,7 @@
3127 3127 private Map getWeekInfo(Integer kcal,Map map,List<String> risks)
3128 3128 {
3129 3129 List<HightWeightWeekModel> weightReport = null;
3130   - if (risks.contains("5aab6d3d422b03d4ad2bf83e") && (risks.contains("5aab6d3e422b03d4ad2bf83f")
  3130 + if (risks.contains("5aab6d3d422b03d4ad2bf83e") || (risks.contains("5aab6d3e422b03d4ad2bf83f")
3131 3131 //需药物治疗的糖尿病
3132 3132 || risks.contains("de7468e6-1bb5-4fab-ae84-78857868409a")))
3133 3133 {