From 52528520d70fa3abc3726cc2c41f3a18d5bd9e0f Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 23 Oct 2018 15:37:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=A8=A9=E8=AE=B0=E5=BD=95=E5=AF=BC?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/MatDeliverController.java | 42 ++++++++-------------- .../web/request/ChildbirthManagerRequest.java | 1 + .../web/result/ChildbirthManagerQueryModel.java | 10 ++++++ .../operate/web/worker/MaterDeliverWorker.java | 7 ++++ 4 files changed, 33 insertions(+), 27 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java index ee4be76..90a8656 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java @@ -294,31 +294,13 @@ public class MatDeliverController extends BaseController{ try { childbirthManagerRequest.setOperatorId(((LoginContext) httpServletRequest.getAttribute("loginContext")).getId()); - Map query; - if (StringUtils.isNotEmpty(childbirthManagerRequest.getInitQuery())) { - // 自定义查询 - query = new HashMap<>(); - String initQuery = childbirthManagerRequest.getInitQuery(); - for (String key : childbirthManagerRequest.getInitQueryMap().keySet()) { - if (initQuery.contains(key)) { - query.put(key, query.get(key)); - } - } - } else { - // 没有自定义查询，开始构造普通查询 - if (StringUtils.isEmpty(childbirthManagerRequest.getIsArea())) { - // 非区域 - query = childbirthManagerRequest.getNormalQueryMap(); - } else { - // 区域 - query = childbirthManagerRequest.getAreaQueryMap(); - } - String queryStr = ""; - for (String key : query.keySet()) { - queryStr += key + ","; - } - childbirthManagerRequest.setInitQuery(queryStr.substring(0, queryStr.length() - 1)); + Map query = childbirthManagerRequest.getInitQueryMap(); + + String queryStr = ""; + for (String key : query.keySet()) { + queryStr += key + ","; } + childbirthManagerRequest.setInitQuery(queryStr.substring(0, queryStr.length() - 1)); childbirthManagerRequest.setExcel(true); // 这里返回的结果必然是这个泛型，之所以query返回的结果集没有用泛型是为了更好的传递数据 @@ -393,11 +375,17 @@ public class MatDeliverController extends BaseController{ map.put("weight",queryModel.getBabyWeight()); map.put("malformation",queryModel.getMalformation() == null ? "" : queryModel.getMalformation()); //queryModel.getTireNumber()-queryModel.getLivingNumber() - map.put("sc","-");//死产 - map.put("jzsx","-");//皮肤接触及早吸吮≥30分钟 + map.put("sc",queryModel.getPregnancyOut());//死产 + + String jcsc = ""; + if (queryModel.getContactM() != null) + { + jcsc = "√"; + } + map.put("jzsx",jcsc);//皮肤接触及早吸吮≥30分钟 map.put("xj","-");//宣教 map.put("jsz",queryModel.getDeliverDoctor());//接生者 - map.put("remark","-");//接生者 + map.put("remark",patients.getMremark() == null ? "" : patients.getMremark());//接生者 num++; list.add(map); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java index 358a9c7..278e275 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java @@ -450,6 +450,7 @@ public class ChildbirthManagerRequest extends BasePageQueryRequest { initQueryMap.put("chBpSzy1", "舒张压"); initQueryMap.put("breath", "呼吸"); initQueryMap.put("pulse", "脉搏"); + initQueryMap.put("contactM", "母婴接触时长"); initQueryMap.put("ohloseBloodL", "产后1小时失血量"); initQueryMap.put("thloseBloodL", "产后2小时失血量"); initQueryMap.put("rhloseBloodL", "产后24小时内失血量"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java index 1f6b525..547a7a1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java @@ -374,6 +374,8 @@ public class ChildbirthManagerQueryModel { * @discription 畸形 */ private String malformation; + + private String contactM; // 新生儿信息结束 // 院内信息开始 @@ -400,6 +402,14 @@ public class ChildbirthManagerQueryModel { // 院内信息结束 + public String getContactM() { + return contactM; + } + + public void setContactM(String contactM) { + this.contactM = contactM; + } + public String getMaternalDeliverId() { return maternalDeliverId; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java index 3a9ca54..ec95e6a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java @@ -153,6 +153,7 @@ public class MaterDeliverWorker implements Callable