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 75c198a..d526a6c 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 @@ -180,6 +180,16 @@ public class MatDeliverController extends BaseController { BaseListResponse baseListResponse; childbirthManagerRequest.setOperatorId(((LoginContext) httpServletRequest.getAttribute("loginContext")).getId()); String hospitalId = autoMatchFacade.getHospitalId(childbirthManagerRequest.getOperatorId()); + + String hsColum = "vcCardNo,name,cardNo,phone,husbandName,husbandCardNo,husbandPhone,pliveTypeId,pcensusTypeId,registerAddress,address,postAddress,dueDate,fileCode,chBpSsy1,chBpSzy1,dueWeek,fetalPosition,heartRate,fetalPresentation,perinealCondition,deliveryMode,breath,needleNum,pulse,prodprocessOne,prodprocessTwo,prodprocessThree,totalprocess,ohloseBloodL,thloseBloodL,rhloseBloodL,loseBloodCause,tpmcType,tpSize,tpWeight,umbilicalCordLength,umbilicalCordEx,umbilicalCordExType,tireNumber,maternalInfo,operationCause,fmHospital,deliverDoctor,sex,babyWeight,babyHeight,apgarScorePf1,apgarScorePf5,apgarScorePf10,pregnancyOut,asphyxiaM,deathCause,babyHealthy,malformation"; + + Organization o = organizationService.getOrganization(Integer.parseInt(hospitalId)); + if (o != null && "12".equals(o.getCityId())) + { + childbirthManagerRequest.setInitQuery(hsColum); + childbirthManagerRequest.setInitQueryMap(childbirthManagerRequest.getInitQueryMapHs()); + } + try { Map query; if (StringUtils.isNotEmpty(childbirthManagerRequest.getInitQuery())) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java index cb904f3..c6326b6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java @@ -86,7 +86,8 @@ public class AntExRecordFacade { @Autowired private AntenatalExaminationFacade antenatalExaminationFacade; - + @Autowired + private ApplyOrderService applyOrderService; @Autowired private AntenatalExaminationService antenatalExaminationService; @@ -679,7 +680,7 @@ public class AntExRecordFacade { end = antExRecordModelList.size(); } listFuture.add(commonThreadPool.submit(new AntExRecordWorker(antExRecordModelList.subList(i, end), isRegion, - organizationService, usersService, recordService, commonService, hospital, basicConfigService, antExService, patientsService))); + organizationService, usersService, recordService, commonService, hospital, basicConfigService, antExService, patientsService,applyOrderService))); } for (Future f : listFuture) { try { @@ -943,54 +944,114 @@ public class AntExRecordFacade { } public void exportfindRegionAntEx(AntExManagerQueryRequest antExManagerQueryRequest, Integer id, boolean b, HttpServletResponse httpServletResponse) { + + + + BaseListResponse listRep = (BaseListResponse) findList(antExManagerQueryRequest, id, b, null, false); List> datas = new ArrayList<>(); - try { - if (listRep != null) { - List list = listRep.getData(); - if (CollectionUtils.isNotEmpty(list)) { - for (AntExManagerResult aer : list) { - Map data = new HashMap<>(); - data.put("checkTime", aer.getCheckTime()); - data.put("name", aer.getName()); - data.put("age", aer.getAge()); - data.put("cDueWeek", aer.getcDueWeek()); - data.put("rLevel", getLevel(aer.getrLevel())); - data.put("riskFactor", aer.getRiskFactor()); - data.put("riskScore", aer.getRiskScore()); - data.put("chTimes", aer.getChTimes()); - data.put("tTimes", aer.gettTimes()); - data.put("dueDate", aer.getDueDate()); - data.put("addr", aer.getAddr()); - data.put("checkHospital", aer.getCheckHospital()); - datas.add(data); + Organization organization = organizationService.getOrganization(Integer.parseInt(autoMatchFacade.getHospitalId(id))); + if (organization != null && organization.getCityId().equals("12")) + { + try { + + if (listRep != null) { + List list = listRep.getData(); + if (CollectionUtils.isNotEmpty(list)) { + for (AntExManagerResult aer : list) { + Map data = new HashMap<>(); + data.put("checkTime", aer.getCheckTime()); + data.put("name", aer.getName()); + data.put("age", aer.getAge()); + data.put("cDueWeek", aer.getcDueWeek()); + data.put("rLevel", getLevel(aer.getrLevel())); + data.put("riskFactor", aer.getRiskFactor()); + data.put("riskScore", aer.getRiskScore()); + data.put("chTimes", aer.getChTimes()); + data.put("tTimes", aer.gettTimes()); + data.put("dueDate", aer.getDueDate()); + data.put("addr", aer.getAddr()); + data.put("checkHospital", aer.getCheckHospital()); + datas.add(data); + } } } + + OutputStream out = httpServletResponse.getOutputStream(); + Map cnames = new LinkedHashMap<>(); + cnames.put("checkTime", "产检日期"); + cnames.put("name", "姓名"); + cnames.put("age", "年龄"); + cnames.put("cDueWeek", "产检孕周"); + cnames.put("rLevel", "高危等级"); + cnames.put("riskFactor", "高危因素"); + cnames.put("riskScore", "高危评分"); + cnames.put("chTimes", "本院产检第次"); + cnames.put("tTimes", "总产检第次"); + cnames.put("dueDate", "预产期"); + cnames.put("addr", "居住地"); + cnames.put("checkHospital", "产检医院"); + httpServletResponse.setContentType("application/octet-stream"); + httpServletResponse.setCharacterEncoding("UTF-8"); + httpServletResponse.setHeader("Content-Disposition", "attachment;fileName=" + "data.xls"); + ExcelUtil.toExcel(out, datas, cnames); + } catch (IOException e) { + e.printStackTrace(); } + } + else + { + try { - OutputStream out = httpServletResponse.getOutputStream(); - Map cnames = new LinkedHashMap<>(); - cnames.put("checkTime", "产检日期"); - cnames.put("name", "姓名"); - cnames.put("age", "年龄"); - cnames.put("cDueWeek", "产检孕周"); - cnames.put("rLevel", "高危等级"); - cnames.put("riskFactor", "高危因素"); - cnames.put("riskScore", "高危评分"); - cnames.put("chTimes", "本院产检第次"); - cnames.put("tTimes", "总产检第次"); - cnames.put("dueDate", "预产期"); - cnames.put("addr", "居住地"); - cnames.put("checkHospital", "产检医院"); - httpServletResponse.setContentType("application/octet-stream"); - httpServletResponse.setCharacterEncoding("UTF-8"); - httpServletResponse.setHeader("Content-Disposition", "attachment;fileName=" + "data.xls"); - ExcelUtil.toExcel(out, datas, cnames); - } catch (IOException e) { - e.printStackTrace(); + if (listRep != null) { + List list = listRep.getData(); + if (CollectionUtils.isNotEmpty(list)) { + for (AntExManagerResult aer : list) { + Map data = new HashMap<>(); + data.put("checkTime", aer.getCheckTime()); + data.put("name", aer.getName()); + data.put("age", aer.getAge()); + data.put("cDueWeek", aer.getcDueWeek()); + data.put("rLevel", getLevel(aer.getrLevel())); + data.put("riskFactor", aer.getRiskFactor()); + data.put("riskScore", aer.getRiskScore()); + data.put("chTimes", aer.getChTimes()); + data.put("tTimes", aer.gettTimes()); + data.put("dueDate", aer.getDueDate()); + data.put("addr", aer.getAddr()); + data.put("checkHospital", aer.getCheckHospital()); + datas.add(data); + } + } + } + + OutputStream out = httpServletResponse.getOutputStream(); + Map cnames = new LinkedHashMap<>(); + cnames.put("checkTime", "产检日期"); + cnames.put("name", "姓名"); + cnames.put("age", "年龄"); + cnames.put("cDueWeek", "产检孕周"); + cnames.put("rLevel", "高危等级"); + cnames.put("riskFactor", "高危因素"); + cnames.put("riskScore", "高危评分"); + cnames.put("chTimes", "本院产检第次"); + cnames.put("tTimes", "总产检第次"); + cnames.put("dueDate", "预产期"); + cnames.put("addr", "居住地"); + cnames.put("checkHospital", "产检医院"); + httpServletResponse.setContentType("application/octet-stream"); + httpServletResponse.setCharacterEncoding("UTF-8"); + httpServletResponse.setHeader("Content-Disposition", "attachment;fileName=" + "data.xls"); + ExcelUtil.toExcel(out, datas, cnames); + } catch (IOException e) { + e.printStackTrace(); + } } + + + } public BaseResponse getRangeRiskAntexlist(AntExManagerQueryRequest antExManagerQueryRequest, Integer userId) { 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 d148d3b..2ce0abb 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 @@ -219,6 +219,7 @@ public class ChildbirthManagerRequest extends BasePageQueryRequest { } private Map initQueryMap; + private Map initQueryMapHs; private Map normalQueryMap; @@ -228,6 +229,14 @@ public class ChildbirthManagerRequest extends BasePageQueryRequest { private Integer operatorId; + public Map getInitQueryMapHs() { + return initQueryMapHs; + } + + public void setInitQueryMapHs(Map initQueryMapHs) { + this.initQueryMapHs = initQueryMapHs; + } + public Map getInitQueryMap() { return initQueryMap; } @@ -489,6 +498,67 @@ public class ChildbirthManagerRequest extends BasePageQueryRequest { initQueryMap.put("maternalDeliverId", ""); initQueryMap.put("patientId", ""); initQueryMap.put("pid", ""); + + + //衡水导出 + Map initQueryMapHs = new LinkedHashMap<>(); + initQueryMapHs.put("vcCardNo", "卡号"); + initQueryMapHs.put("name", "妇女姓名"); + initQueryMapHs.put("cardNo", "妇女证件号码"); + initQueryMapHs.put("phone", "妇女联系方式"); + initQueryMapHs.put("husbandName", "丈夫姓名"); + initQueryMapHs.put("husbandCardNo", "丈夫证件号码"); + initQueryMapHs.put("husbandPhone", "丈夫联系方式"); + initQueryMapHs.put("pliveTypeId", "居住类别"); + initQueryMapHs.put("pcensusTypeId", "户口类型"); + initQueryMapHs.put("registerAddress", "户籍地"); + initQueryMapHs.put("address", "现住址"); + initQueryMapHs.put("postAddress", "产后休养地"); + initQueryMapHs.put("dueDate", "分娩日期"); + initQueryMapHs.put("fileCode", "住院号"); + initQueryMapHs.put("chBpSsy1", "收缩压"); + initQueryMapHs.put("chBpSzy1", "舒张压"); + initQueryMapHs.put("dueWeek", "孕周"); + initQueryMapHs.put("fetalPosition", "胎方位"); + initQueryMapHs.put("heartRate", "胎心"); + initQueryMapHs.put("fetalPresentation", "先露"); + initQueryMapHs.put("perinealCondition", "会阴情况"); + initQueryMapHs.put("deliveryMode", "分娩方式"); + initQueryMapHs.put("breath", "呼吸"); + initQueryMapHs.put("needleNum", "缝线针数"); + initQueryMapHs.put("pulse", "脉搏"); + initQueryMapHs.put("prodprocessOne", "第一产程"); + initQueryMapHs.put("prodprocessTwo", "第二产程"); + initQueryMapHs.put("prodprocessThree", "第三产程"); + initQueryMapHs.put("totalprocess", "总产程"); + initQueryMapHs.put("ohloseBloodL", "产后1小时失血量"); + initQueryMapHs.put("thloseBloodL", "产后2小时失血量"); + initQueryMapHs.put("rhloseBloodL", "产后24小时内失血量"); + initQueryMapHs.put("loseBloodCause", "失血原因"); + initQueryMapHs.put("tpmcType", "胎盘娩出方式"); + initQueryMapHs.put("tpSize", "胎盘大小"); + initQueryMapHs.put("tpWeight", "胎盘重量"); + initQueryMapHs.put("umbilicalCordLength", "脐带长度"); + initQueryMapHs.put("umbilicalCordEx", "脐带是否异常"); + initQueryMapHs.put("umbilicalCordExType", "脐带异常类型"); + initQueryMapHs.put("tireNumber", "胎数"); + initQueryMapHs.put("maternalInfo", "产妇情况"); + initQueryMapHs.put("operationCause", "手术原因"); + initQueryMapHs.put("fmHospital", "分娩机构"); + initQueryMapHs.put("deliverDoctor", "接生者"); + initQueryMapHs.put("sex", "儿童性别"); + initQueryMapHs.put("babyWeight", "儿童体重"); + initQueryMapHs.put("babyHeight", "儿童身长"); + initQueryMapHs.put("apgarScorePf1", "Apgar1分钟"); + initQueryMapHs.put("apgarScorePf5", "Apgar5分钟"); + initQueryMapHs.put("apgarScorePf10", "Apgar10分钟"); + initQueryMapHs.put("pregnancyOut", "妊娠结局"); + initQueryMapHs.put("asphyxiaM", "窒息分钟数"); + initQueryMapHs.put("deathCause", "原因"); + initQueryMapHs.put("babyHealthy", "新生儿疾病"); + initQueryMapHs.put("malformation", "畸形"); + + Map normalQueryMap = new LinkedHashMap<>(); normalQueryMap.put("apgarScorePf1", "Apgar1分钟"); normalQueryMap.put("apgarScorePf5", "Apgar5分钟"); @@ -532,6 +602,7 @@ public class ChildbirthManagerRequest extends BasePageQueryRequest { areaQueryMap.put("patientId", ""); areaQueryMap.put("pid", ""); this.initQueryMap = initQueryMap; + this.initQueryMapHs = initQueryMapHs; this.normalQueryMap = normalQueryMap; this.areaQueryMap = areaQueryMap; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntExManagerResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntExManagerResult.java index f4027da..21aa433 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntExManagerResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntExManagerResult.java @@ -60,11 +60,61 @@ public class AntExManagerResult { private String checkHospital; + //户籍地址 private String addr; //产次 private int cTimes=1; private int levelNum; + private String vcCardNo; + private String cardNo; + private String isSieve; + + //产后修养地 + private String postAddress; + + //居住地址 + private String address; + + public String getCardNo() { + return cardNo; + } + + public void setCardNo(String cardNo) { + this.cardNo = cardNo; + } + + public String getIsSieve() { + return isSieve; + } + + public void setIsSieve(String isSieve) { + this.isSieve = isSieve; + } + + public String getPostAddress() { + return postAddress; + } + + public void setPostAddress(String postAddress) { + this.postAddress = postAddress; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + public String getVcCardNo() { + return vcCardNo; + } + + public void setVcCardNo(String vcCardNo) { + this.vcCardNo = vcCardNo; + } public int getLevelNum() { return levelNum; 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 a8ba9ee..0f0aae5 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 @@ -129,6 +129,10 @@ public class ChildbirthManagerQueryModel { * @discription 丈夫联系方式 */ private String husbandPhone; + private String husbandName; + private String husbandCardNo; + private String registerAddress; + private String postAddress; // 基本信息结束 // 分娩信息开始 @@ -437,6 +441,38 @@ public class ChildbirthManagerQueryModel { //手动分娩孕周 private String handDueWeek; + public String getHusbandName() { + return husbandName; + } + + public void setHusbandName(String husbandName) { + this.husbandName = husbandName; + } + + public String getHusbandCardNo() { + return husbandCardNo; + } + + public void setHusbandCardNo(String husbandCardNo) { + this.husbandCardNo = husbandCardNo; + } + + public String getRegisterAddress() { + return registerAddress; + } + + public void setRegisterAddress(String registerAddress) { + this.registerAddress = registerAddress; + } + + public String getPostAddress() { + return postAddress; + } + + public void setPostAddress(String postAddress) { + this.postAddress = postAddress; + } + public String getHandDueWeek() { return handDueWeek; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/AntExRecordWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/AntExRecordWorker.java index 6457a37..bfb2a8c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/AntExRecordWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/AntExRecordWorker.java @@ -1,6 +1,7 @@ package com.lyms.platform.operate.web.worker; import com.lyms.platform.biz.service.*; +import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.utils.ExceptionUtils; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.result.AntExManagerResult; @@ -14,6 +15,7 @@ import com.lyms.platform.pojo.AntExRecordModel; import com.lyms.platform.pojo.AntenatalExaminationModel; import com.lyms.platform.pojo.Patients; import com.lyms.platform.query.AntExRecordQuery; +import com.lyms.platform.query.SieveApplyOrderQuery; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.math.NumberUtils; @@ -44,7 +46,7 @@ public class AntExRecordWorker implements Callable> { private AntenatalExaminationService antenatalExaminationService; public SimpleDateFormat y_m_d = new SimpleDateFormat("yyyy-MM-dd"); - + ApplyOrderService applyOrderService; public AntExRecordWorker(List record, boolean isRegion, OrganizationService organizationService, @@ -53,7 +55,8 @@ public class AntExRecordWorker implements Callable> { CommonService commonService, String hospital, BasicConfigService basicConfigService, - AntenatalExaminationService antenatalExaminationService,PatientsService patientsService) { + AntenatalExaminationService antenatalExaminationService,PatientsService patientsService, + ApplyOrderService applyOrderService) { this.record = record; this.isRegion = isRegion; this.organizationService = organizationService; @@ -64,6 +67,7 @@ public class AntExRecordWorker implements Callable> { this.basicConfigService = basicConfigService; this.antenatalExaminationService = antenatalExaminationService; this.patientsService = patientsService; + this.applyOrderService = applyOrderService; } @Override @@ -146,6 +150,23 @@ public class AntExRecordWorker implements Callable> { antExManagerResult.setChTimes(dichi - cdichi); handleRisk(e, antExManagerResult); + + if (isRegion) { + antExManagerResult.setPostAddress(CommonsHelper.getResidence(patients.getProvincePostRestId(), patients.getCityPostRestId(), + patients.getAreaPostRestId(), patients.getStreetPostRestId(), patients.getAddressPostRest(), basicConfigService)); + + antExManagerResult.setAddress(CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(), + patients.getAreaId(), patients.getStreetId(), patients.getAddress(), basicConfigService)); + + antExManagerResult.setVcCardNo(patients.getVcCardNo()); + antExManagerResult.setCardNo(patients.getCardNo()); + SieveApplyOrderQuery applyOrderQuery = new SieveApplyOrderQuery(); + applyOrderQuery.setParentId(patients.getId()); + applyOrderQuery.setYn(YnEnums.YES.getId()); + antExManagerResult.setIsSieve(CollectionUtils.isEmpty(applyOrderService.querySieveApplyOrderWithQuery(applyOrderQuery)) ? "未做" : "已做"); + } + + data.add(antExManagerResult); } catch (Exception e1) { ExceptionUtils.catchException(e1, "antex worker error."); 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 a862704..89ed287 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 @@ -105,14 +105,27 @@ public class MaterDeliverWorker implements Callable