jiangjiazhi / regional-platform

Download as
Browse Code »

Commit ad48795f371296a7f31b05434cc4efb9802c0059

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

分娩记录导出

Showing 3 changed files with 33 additions and 11 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java View file @ ad48795
... ... @@ -300,7 +300,7 @@
300 300 for (String key : query.keySet()) {
301 301 queryStr += key + ",";
302 302 }
303   - childbirthManagerRequest.setInitQuery(queryStr.substring(0, queryStr.length() - 1));
  303 + childbirthManagerRequest.setInitQuery(queryStr+"fmTime");
304 304  
305 305 childbirthManagerRequest.setExcel(true);
306 306 // 这里返回的结果必然是这个泛型，之所以query返回的结果集没有用泛型是为了更好的传递数据
... ... @@ -314,7 +314,7 @@
314 314 Map<String, Object> map = new LinkedHashMap<>();
315 315 map.put("num",num);
316 316 map.put("dueDate",queryModel.getDueDate());
317   - map.put("dueTime",queryModel.getDueDate());
  317 + map.put("fmTime",queryModel.getFmTime());
318 318 map.put("zyNo","-");
319 319 map.put("name",queryModel.getName());
320 320 map.put("age", queryModel.getAge());
... ... @@ -351,8 +351,8 @@
351 351 map.put("A","-");
352 352 map.put("Y","-");
353 353 map.put("M","-");
354   - map.put("fetalPosition", queryModel.getFetalPosition());
355   - map.put("perinealCondition",queryModel.getPerinealCondition());
  354 + map.put("fetalPosition", queryModel.getFetalPosition() == null ? "" : queryModel.getFetalPosition());
  355 + map.put("perinealCondition",queryModel.getPerinealCondition() == null ? "" : queryModel.getPerinealCondition());
356 356  
357 357 String reslult1 = "";
358 358 String reslult2 = "";
359 359  
360 360  
... ... @@ -371,16 +371,27 @@
371 371 map.put("deliveryMode4","");
372 372 map.put("thloseBloodL",queryModel.getThloseBloodL() == null ? "" : queryModel.getThloseBloodL());
373 373 map.put("sex",queryModel.getSex());
374   - map.put("height",queryModel.getBabyHeight());
375   - map.put("weight",queryModel.getBabyWeight());
  374 + map.put("height",queryModel.getBabyHeight() == null ? "" : Double.parseDouble(queryModel.getBabyHeight()) * 1000);
  375 + map.put("weight",queryModel.getBabyWeight() == null ? "" : Double.parseDouble(queryModel.getBabyWeight()) * 1000);
376 376 map.put("malformation",queryModel.getMalformation() == null ? "" : queryModel.getMalformation());
377 377 //queryModel.getTireNumber()-queryModel.getLivingNumber()
378 378 map.put("sc",queryModel.getPregnancyOut());//死产
379 379  
380 380 String jcsc = "";
381   - if (queryModel.getContactM() != null)
  381 + if (queryModel.getContactM() != null && queryModel.getContactM().contains(","))
382 382 {
383   - jcsc = "√";
  383 + String[] arrs = queryModel.getContactM().split(",");
  384 + for (int i = 0 ;i < arrs.length ; i++)
  385 + {
  386 + if (arrs[i] != null && StringUtils.isNumeric(arrs[i]) && Integer.parseInt(arrs[i]) >= 30)
  387 + {
  388 + jcsc = "√";
  389 + if (i != arrs.length -1)
  390 + {
  391 + jcsc += ",";
  392 + }
  393 + }
  394 + }
384 395 }
385 396 map.put("jzsx",jcsc);//皮肤接触及早吸吮≥30分钟
386 397 map.put("xj","-");//宣教
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java View file @ ad48795
... ... @@ -401,6 +401,15 @@
401 401 private String fmHospital;
402 402 // 院内信息结束
403 403  
  404 + private String fmTime;
  405 +
  406 + public String getFmTime() {
  407 + return fmTime;
  408 + }
  409 +
  410 + public void setFmTime(String fmTime) {
  411 + this.fmTime = fmTime;
  412 + }
404 413  
405 414 public String getContactM() {
406 415 return contactM;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java View file @ ad48795
... ... @@ -154,6 +154,7 @@
154 154 String babyHealthy = "";
155 155 String malformation = "";
156 156 String contactM = "";
  157 + String fmTime = "";
157 158 try {
158 159 for (BabyModel babyModel : babyModelList) {
159 160 if (initQuery.contains("pregnancyOut")) {
160 161  
... ... @@ -173,15 +174,15 @@
173 174 sex += sexEnum.getText() + ",";
174 175 break;
175 176 }
176   - if (org.apache.commons.lang.StringUtils.isEmpty(sex)) {
177   - sex += "-,";
178   - }
179 177 }
180 178 }
181 179  
182 180 if (initQuery.contains("contactM")) {
183 181 contactM+=babyModel.getContactM()+ ",";
184 182 }
  183 + if (initQuery.contains("fmTime")) {
  184 + fmTime+= new SimpleDateFormat("HH:mm").format(babyModel.getBirth())+ ",";
  185 + }
185 186  
186 187 babyWeight += babyModel.getBabyWeight() == null ? "-," : babyModel.getBabyWeight() + ",";
187 188 babyHeight += babyModel.getBabyHeight() == null ? "-," : babyModel.getBabyHeight() + ",";
... ... @@ -215,6 +216,7 @@
215 216 childbirthManagerQueryModel.setBabyHealthy(babyHealthy.length() == 0 ? "" : babyHealthy.substring(0, babyHealthy.length() - 1));
216 217 childbirthManagerQueryModel.setMalformation(malformation.length() == 0 ? "" : malformation.substring(0, malformation.length() - 1));
217 218 childbirthManagerQueryModel.setContactM(contactM.length() == 0 ? "" : contactM.substring(0, contactM.length() - 1));
  219 + childbirthManagerQueryModel.setFmTime(fmTime.length() == 0 ? "" : fmTime.substring(0, fmTime.length() - 1));
218 220 }
219 221 }
220 222