jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 52528520d70fa3abc3726cc2c41f3a18d5bd9e0f

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

分娩记录导出

Showing 4 changed files with 33 additions and 27 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java View file @ 5252852
... ... @@ -294,31 +294,13 @@
294 294 try {
295 295 childbirthManagerRequest.setOperatorId(((LoginContext) httpServletRequest.getAttribute("loginContext")).getId());
296 296  
297   - Map<String, String> query;
298   - if (StringUtils.isNotEmpty(childbirthManagerRequest.getInitQuery())) {
299   - // 自定义查询
300   - query = new HashMap<>();
301   - String initQuery = childbirthManagerRequest.getInitQuery();
302   - for (String key : childbirthManagerRequest.getInitQueryMap().keySet()) {
303   - if (initQuery.contains(key)) {
304   - query.put(key, query.get(key));
305   - }
306   - }
307   - } else {
308   - // 没有自定义查询，开始构造普通查询
309   - if (StringUtils.isEmpty(childbirthManagerRequest.getIsArea())) {
310   - // 非区域
311   - query = childbirthManagerRequest.getNormalQueryMap();
312   - } else {
313   - // 区域
314   - query = childbirthManagerRequest.getAreaQueryMap();
315   - }
316   - String queryStr = "";
317   - for (String key : query.keySet()) {
318   - queryStr += key + ",";
319   - }
320   - childbirthManagerRequest.setInitQuery(queryStr.substring(0, queryStr.length() - 1));
  297 + Map<String, String> query = childbirthManagerRequest.getInitQueryMap();
  298 +
  299 + String queryStr = "";
  300 + for (String key : query.keySet()) {
  301 + queryStr += key + ",";
321 302 }
  303 + childbirthManagerRequest.setInitQuery(queryStr.substring(0, queryStr.length() - 1));
322 304  
323 305 childbirthManagerRequest.setExcel(true);
324 306 // 这里返回的结果必然是这个泛型，之所以query返回的结果集没有用泛型是为了更好的传递数据
325 307  
... ... @@ -393,11 +375,17 @@
393 375 map.put("weight",queryModel.getBabyWeight());
394 376 map.put("malformation",queryModel.getMalformation() == null ? "" : queryModel.getMalformation());
395 377 //queryModel.getTireNumber()-queryModel.getLivingNumber()
396   - map.put("sc","-");//死产
397   - map.put("jzsx","-");//皮肤接触及早吸吮≥30分钟
  378 + map.put("sc",queryModel.getPregnancyOut());//死产
  379 +
  380 + String jcsc = "";
  381 + if (queryModel.getContactM() != null)
  382 + {
  383 + jcsc = "√";
  384 + }
  385 + map.put("jzsx",jcsc);//皮肤接触及早吸吮≥30分钟
398 386 map.put("xj","-");//宣教
399 387 map.put("jsz",queryModel.getDeliverDoctor());//接生者
400   - map.put("remark","-");//接生者
  388 + map.put("remark",patients.getMremark() == null ? "" : patients.getMremark());//接生者
401 389 num++;
402 390 list.add(map);
403 391 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java View file @ 5252852
... ... @@ -450,6 +450,7 @@
450 450 initQueryMap.put("chBpSzy1", "舒张压");
451 451 initQueryMap.put("breath", "呼吸");
452 452 initQueryMap.put("pulse", "脉搏");
  453 + initQueryMap.put("contactM", "母婴接触时长");
453 454 initQueryMap.put("ohloseBloodL", "产后1小时失血量");
454 455 initQueryMap.put("thloseBloodL", "产后2小时失血量");
455 456 initQueryMap.put("rhloseBloodL", "产后24小时内失血量");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java View file @ 5252852
... ... @@ -374,6 +374,8 @@
374 374 * @discription 畸形
375 375 */
376 376 private String malformation;
  377 +
  378 + private String contactM;
377 379 // 新生儿信息结束
378 380  
379 381 // 院内信息开始
... ... @@ -399,6 +401,14 @@
399 401 private String fmHospital;
400 402 // 院内信息结束
401 403  
  404 +
  405 + public String getContactM() {
  406 + return contactM;
  407 + }
  408 +
  409 + public void setContactM(String contactM) {
  410 + this.contactM = contactM;
  411 + }
402 412  
403 413 public String getMaternalDeliverId() {
404 414 return maternalDeliverId;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java View file @ 5252852
... ... @@ -153,6 +153,7 @@
153 153 String asphyxiaM = "";
154 154 String babyHealthy = "";
155 155 String malformation = "";
  156 + String contactM = "";
156 157 try {
157 158 for (BabyModel babyModel : babyModelList) {
158 159 if (initQuery.contains("pregnancyOut")) {
... ... @@ -177,6 +178,11 @@
177 178 }
178 179 }
179 180 }
  181 +
  182 + if (initQuery.contains("contactM")) {
  183 + contactM+=babyModel.getContactM()+ ",";
  184 + }
  185 +
180 186 babyWeight += babyModel.getBabyWeight() == null ? "-," : babyModel.getBabyWeight() + ",";
181 187 babyHeight += babyModel.getBabyHeight() == null ? "-," : babyModel.getBabyHeight() + ",";
182 188 asphyxiaM += babyModel.getAsphyxiaM() == null ? "-," : babyModel.getAsphyxiaM() + ",";
... ... @@ -208,6 +214,7 @@
208 214 childbirthManagerQueryModel.setAsphyxiaM(asphyxiaM.length() == 0 ? "" : asphyxiaM.substring(0, asphyxiaM.length() - 1));
209 215 childbirthManagerQueryModel.setBabyHealthy(babyHealthy.length() == 0 ? "" : babyHealthy.substring(0, babyHealthy.length() - 1));
210 216 childbirthManagerQueryModel.setMalformation(malformation.length() == 0 ? "" : malformation.substring(0, malformation.length() - 1));
  217 + childbirthManagerQueryModel.setContactM(contactM.length() == 0 ? "" : contactM.substring(0, contactM.length() - 1));
211 218 }
212 219 }
213 220