From df4f2cb2dd225f27e802c9a6c899c04cc6b69a30 Mon Sep 17 00:00:00 2001 From: wtt Date: Mon, 22 Feb 2021 16:05:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=BF=E5=BE=B7=E5=88=86=E5=A8=A9=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 | 58 +++++++++++++++++++--- .../operate/web/facade/MatDeliverFacade.java | 5 +- .../web/request/ChildbirthManagerRequest.java | 38 ++++++++++++++ .../web/result/ChildbirthManagerQueryModel.java | 44 ++++++++++++++++ .../operate/web/worker/MaterDeliverWorker.java | 42 +++++++++++++++- 5 files changed, 178 insertions(+), 9 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 c7a654a..4a55215 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 @@ -271,7 +271,14 @@ public class MatDeliverController extends BaseController { childbirthManagerRequest.setInitQuery(hsColum); childbirthManagerRequest.setInitQueryMap(childbirthManagerRequest.getInitQueryMapHs()); } - + if (o != null && "9".equals(o.getCityId())) + { + String cdColum = "dueDate,fmHospital,name,age,cardNo,buildWeek,czWeek,hivkt," + + "syjg,ygbmky,dueWeek,deliveryMode,maternalInfo,tireNumber,livingNumber," + + "deliverDoctor,phone,rhloseBloodL,gcStatus,recordsNum"; + childbirthManagerRequest.setInitQuery(cdColum); + childbirthManagerRequest.setInitQueryMap(childbirthManagerRequest.getInitQueryMapCd()); + } Map query; if (StringUtils.isNotEmpty(childbirthManagerRequest.getInitQuery())) { // 自定义查询 @@ -303,14 +310,51 @@ public class MatDeliverController extends BaseController { @SuppressWarnings("unchecked") List childbirthManagerQueryModelList = matDeliverFacade.childbirthManager(childbirthManagerRequest).getData(); List> list = new ArrayList<>(); - for (ChildbirthManagerQueryModel childbirthManagerQueryModel : childbirthManagerQueryModelList) { - Map map = BeanUtils.objectToObjectMap(childbirthManagerQueryModel); - for (String key : map.keySet()) { - if (StringUtils.isEmpty(String.valueOf(map.get(key)))) { - map.put(key, "-"); + + if (o != null && "9".equals(o.getCityId())) + { + for (ChildbirthManagerQueryModel childbirthManagerQueryModel : childbirthManagerQueryModelList) { + + if(StringUtils.isNotEmpty(childbirthManagerQueryModel.getHivkt())){ + if("yin".equals(childbirthManagerQueryModel.getHivkt())){ + childbirthManagerQueryModel.setHivkt("-"); + }else if("yang".equals(childbirthManagerQueryModel.getHivkt())){ + childbirthManagerQueryModel.setHivkt("+"); + } } + if(StringUtils.isNotEmpty(childbirthManagerQueryModel.getSyjg())){ + if("yin".equals(childbirthManagerQueryModel.getSyjg())){ + childbirthManagerQueryModel.setSyjg("-"); + }else if("yang".equals(childbirthManagerQueryModel.getSyjg())){ + childbirthManagerQueryModel.setSyjg("+"); + } + } + if(StringUtils.isNotEmpty(childbirthManagerQueryModel.getYgbmky())){ + if("yin".equals(childbirthManagerQueryModel.getYgbmky())){ + childbirthManagerQueryModel.setYgbmky("-"); + }else if("yang".equals(childbirthManagerQueryModel.getYgbmky())){ + childbirthManagerQueryModel.setYgbmky("+"); + } + } + Map map = BeanUtils.objectToObjectMap(childbirthManagerQueryModel); + for (String key : map.keySet()) { + if (StringUtils.isEmpty(String.valueOf(map.get(key)))) { + map.put(key, ""); + continue; + } + } + list.add(map); + } + }else { + for (ChildbirthManagerQueryModel childbirthManagerQueryModel : childbirthManagerQueryModelList) { + Map map = BeanUtils.objectToObjectMap(childbirthManagerQueryModel); + for (String key : map.keySet()) { + if (StringUtils.isEmpty(String.valueOf(map.get(key)))) { + map.put(key, "-"); + } + } + list.add(map); } - list.add(map); } Map header = new LinkedHashMap<>(); Map temp = childbirthManagerRequest.getInitQueryMap(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 4ad642c..b1d9c96 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -109,6 +109,9 @@ public class MatDeliverFacade { @Autowired private UsersService usersService; @Autowired + private AntenatalExaminationService antExService; + + @Autowired private StopPregnancyService stopPregnancyService; @Autowired @@ -2657,7 +2660,7 @@ public class MatDeliverFacade { } List mlist = maternalDeliverModelList.subList(i, end); Callable c = new MaterDeliverWorker(organizationService, usersService, - babyService, basicConfigService, childbirthManagerRequest.getInitQuery(), + babyService,antExService, basicConfigService, childbirthManagerRequest.getInitQuery(), mlist, patientsMap, postpartumRecordsService, recordsService, childbirthManagerRequest.getShowDetail()); Future f = commonThreadPool.submit(c); if (f != null) { 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 ae0777f..116fe78 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 @@ -220,6 +220,7 @@ public class ChildbirthManagerRequest extends BasePageQueryRequest { private Map initQueryMap; private Map initQueryMapHs; + private Map initQueryMapCd; private Map normalQueryMap; @@ -433,6 +434,14 @@ public class ChildbirthManagerRequest extends BasePageQueryRequest { return areaQueryMap; } + public Map getInitQueryMapCd() { + return initQueryMapCd; + } + + public void setInitQueryMapCd(Map initQueryMapCd) { + this.initQueryMapCd = initQueryMapCd; + } + public void setAreaQueryMap(Map areaQueryMap) { this.areaQueryMap = areaQueryMap; } @@ -499,6 +508,32 @@ public class ChildbirthManagerRequest extends BasePageQueryRequest { initQueryMap.put("maternalDeliverId", ""); initQueryMap.put("patientId", ""); initQueryMap.put("pid", ""); + //承德导出 + Map initQueryMapCd = new LinkedHashMap<>(); + initQueryMapCd.put("dueDate", "分娩日期"); + initQueryMapCd.put("fmHospital", "分娩单位"); + initQueryMapCd.put("name", "姓名"); + initQueryMapCd.put("age", "年龄"); + initQueryMapCd.put("cardNo", "证件号"); + initQueryMapCd.put("buildWeek", "建档孕周"); + initQueryMapCd.put("czWeek", "初诊孕周"); + initQueryMapCd.put("hivkt", "艾滋病检测结果"); + initQueryMapCd.put("syjg", "梅毒检测结果"); + initQueryMapCd.put("ygbmky", "乙肝检测结果"); + initQueryMapCd.put("dueWeek", "分娩孕周"); + initQueryMapCd.put("deliveryMode", "分娩方式"); + initQueryMapCd.put("maternalInfo", "产妇情况"); + initQueryMapCd.put("tireNumber", "胎数"); + initQueryMapCd.put("livingNumber", "活产数"); + initQueryMapCd.put("deliverDoctor", "接生医生"); + initQueryMapCd.put("phone", "联系方式"); + initQueryMapCd.put("rhloseBloodL", "产后24小时内失血量"); +// initQueryMapCd.put("apgarScorePf1", "Apgar1分钟"); +// initQueryMapCd.put("apgarScorePf5", "Apgar5分钟"); +// initQueryMapCd.put("apgarScorePf10", "Apgar10分钟"); + initQueryMapCd.put("gcStatus", "产后观察"); + initQueryMapCd.put("recordsNum", "记录条数"); + //衡水导出 @@ -605,9 +640,12 @@ public class ChildbirthManagerRequest extends BasePageQueryRequest { areaQueryMap.put("maternalDeliverId", ""); areaQueryMap.put("patientId", ""); areaQueryMap.put("pid", ""); + + this.initQueryMap = initQueryMap; this.initQueryMapHs = initQueryMapHs; this.normalQueryMap = normalQueryMap; + this.initQueryMapCd = initQueryMapCd; this.areaQueryMap = areaQueryMap; } } 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 16a798d..d65c9c7 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 @@ -11,6 +11,18 @@ import java.util.Map; */ public class ChildbirthManagerQueryModel { + /*承德定制*/ + //初诊孕周 + private String czWeek; + // 艾滋病检测结果 + private String hivkt; + // 梅毒检测结果 + private String syjg; + // 乙肝检测结果 + private String ygbmky; + + + private String maternalDeliverId; private String patientId; @@ -1095,4 +1107,36 @@ public class ChildbirthManagerQueryModel { public void setBuildWeek(String buildWeek) { this.buildWeek = buildWeek; } + + public String getCzWeek() { + return czWeek; + } + + public void setCzWeek(String czWeek) { + this.czWeek = czWeek; + } + + public String getHivkt() { + return hivkt; + } + + public void setHivkt(String hivkt) { + this.hivkt = hivkt; + } + + public String getSyjg() { + return syjg; + } + + public void setSyjg(String syjg) { + this.syjg = syjg; + } + + public String getYgbmky() { + return ygbmky; + } + + public void setYgbmky(String ygbmky) { + this.ygbmky = ygbmky; + } } 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 f130eab..7399a68 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 @@ -9,6 +9,7 @@ import com.lyms.platform.operate.web.utils.CommonsHelper; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.*; +import com.lyms.platform.query.AntExChuQuery; import com.lyms.platform.query.BabyModelQuery; import com.lyms.platform.query.PostpartumRecordsQuery; import com.lyms.platform.query.RecordsQuery; @@ -34,6 +35,7 @@ public class MaterDeliverWorker implements Callable maternalDeliverModelList; @@ -43,7 +45,7 @@ public class MaterDeliverWorker implements Callable maternalDeliverModelList,Map patientsMap, PostpartumRecordsService postpartumRecordsService,RecordsService recordsService,int showDetail) { this.maternalDeliverModelList = maternalDeliverModelList; @@ -51,6 +53,7 @@ public class MaterDeliverWorker implements Callable antExChuModels = antExService.queryAntExChu(antExChuQuery);//初诊记录 + if(CollectionUtils.isNotEmpty(antExChuModels)){ + AntExChuModel antExChuModel = antExChuModels.get(0); + if (antExChuModel !=null) { + String czWeek = ""; + try { + if (antExChuModel.getCreated().getTime() - patients.getDueDate().getTime() > 0 && patients.getBuildType() == 2) { + czWeek = "已分娩"; + } else { + int days = DateUtil.daysBetween(patients.getLastMenses(), antExChuModel.getCreated()); + if (days > 7 * 42 - 1) { + czWeek = "已分娩"; + } else { + String week = (days / 7) + ""; + int day = (days % 7); + czWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : ""); + } + } + } catch (Exception e) { + // 什么都不干 + } + childbirthManagerQueryModel.setCzWeek(czWeek);//初诊孕周 + childbirthManagerQueryModel.setHivkt(antExChuModel.getHivkt()); // 艾滋病检测结果 + childbirthManagerQueryModel.setSyjg(antExChuModel.getSyjg()); // 梅毒检测结果 + childbirthManagerQueryModel.setYgbmky(antExChuModel.getYgbmky()); // 乙肝检测结果 (乙肝表面抗原) + } + + } + + } if ("2100001635".equals(patients.getHospitalId())) { -- 1.8.3.1