From a15758d9eb0e693f09204c3ad2f373709c854add Mon Sep 17 00:00:00 2001 From: wtt Date: Thu, 18 Feb 2021 13:53:53 +0800 Subject: [PATCH] update --- .../web/controller/MatDeliverController.java | 2 +- .../web/request/ChildbirthManagerRequest.java | 2 ++ .../web/result/ChildbirthManagerQueryModel.java | 15 +++++++++++++++ .../operate/web/worker/MaterDeliverWorker.java | 21 +++++++++++++++++++++ 4 files changed, 39 insertions(+), 1 deletion(-) 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 9aacda6..c7a654a 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 @@ -263,7 +263,7 @@ public class MatDeliverController extends BaseController { String hospitalId = autoMatchFacade.getHospitalId(childbirthManagerRequest.getOperatorId()); - String hsColum = "livingNumber,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"; + String hsColum = "livingNumber,vcCardNo,name,cardNo,phone,husbandName,husbandCardNo,husbandPhone,pliveTypeId,pcensusTypeId,registerAddress,address,buildWeek,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())) 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 56d2cf5..ae0777f 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 @@ -514,6 +514,7 @@ public class ChildbirthManagerRequest extends BasePageQueryRequest { initQueryMapHs.put("pcensusTypeId", "户口类型"); initQueryMapHs.put("registerAddress", "户籍地"); initQueryMapHs.put("address", "现住址"); + initQueryMapHs.put("buildWeek", "建档孕周"); initQueryMapHs.put("postAddress", "产后休养地"); initQueryMapHs.put("dueDate", "分娩日期"); initQueryMapHs.put("fileCode", "住院号"); @@ -568,6 +569,7 @@ public class ChildbirthManagerRequest extends BasePageQueryRequest { normalQueryMap.put("name", "姓名"); normalQueryMap.put("age", "年龄"); normalQueryMap.put("cardNo", "证件号"); + normalQueryMap.put("buildWeek", "建档孕周"); normalQueryMap.put("dueWeek", "分娩孕周"); normalQueryMap.put("handDueWeek", "手动分娩孕周"); normalQueryMap.put("deliveryMode", "分娩方式"); 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 0f0aae5..16a798d 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 @@ -54,6 +54,13 @@ public class ChildbirthManagerQueryModel { /** * @auther HuJiaqi + * @createTime 2016年12月23日 09时54分 + * @discription 建档孕周 + */ + private String buildWeek; + + /** + * @auther HuJiaqi * @createTime 2016年12月07日 16时38分 * @discription 分娩方式 */ @@ -1080,4 +1087,12 @@ public class ChildbirthManagerQueryModel { public void setDeliveryMode1(String deliveryMode1) { this.deliveryMode1 = deliveryMode1; } + + public String getBuildWeek() { + return buildWeek; + } + + public void setBuildWeek(String buildWeek) { + this.buildWeek = buildWeek; + } } 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 66a8070..f130eab 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 @@ -96,6 +96,27 @@ public class MaterDeliverWorker implements Callable 0 && patients.getBuildType() == 2) { +// if (patients.getBookbuildingDate().getTime() - patients.getFmDate().getTime() > 0 && patients.getBuildType() == 2) { + dueWeek = "已分娩"; + } else { + int days = DateUtil.daysBetween(patients.getLastMenses(), patients.getBookbuildingDate()); + if (days > 7 * 42 - 1) { + dueWeek = "已分娩"; + } else { + String week = (days / 7) + ""; + int day = (days % 7); + dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : ""); + } + } + } catch (Exception e) { + // 什么都不干 + } + childbirthManagerQueryModel.setBuildWeek(dueWeek); + // 分娩日期 childbirthManagerQueryModel.setDueDate(DateUtil.getyyyy_MM_dd(patients.getFmDate())); // name -- 1.8.3.1