jiangjiazhi / regional-platform

Download as
Browse Code »

Commit a15758d9eb0e693f09204c3ad2f373709c854add

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

update

Showing 4 changed files with 39 additions and 1 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java View file @ a15758d
... ... @@ -263,7 +263,7 @@
263 263  
264 264 String hospitalId = autoMatchFacade.getHospitalId(childbirthManagerRequest.getOperatorId());
265 265  
266   - 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";
  266 + 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";
267 267  
268 268 Organization o = organizationService.getOrganization(Integer.parseInt(hospitalId));
269 269 if (o != null && "12".equals(o.getCityId()))
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java View file @ a15758d
... ... @@ -514,6 +514,7 @@
514 514 initQueryMapHs.put("pcensusTypeId", "户口类型");
515 515 initQueryMapHs.put("registerAddress", "户籍地");
516 516 initQueryMapHs.put("address", "现住址");
  517 + initQueryMapHs.put("buildWeek", "建档孕周");
517 518 initQueryMapHs.put("postAddress", "产后休养地");
518 519 initQueryMapHs.put("dueDate", "分娩日期");
519 520 initQueryMapHs.put("fileCode", "住院号");
... ... @@ -568,6 +569,7 @@
568 569 normalQueryMap.put("name", "姓名");
569 570 normalQueryMap.put("age", "年龄");
570 571 normalQueryMap.put("cardNo", "证件号");
  572 + normalQueryMap.put("buildWeek", "建档孕周");
571 573 normalQueryMap.put("dueWeek", "分娩孕周");
572 574 normalQueryMap.put("handDueWeek", "手动分娩孕周");
573 575 normalQueryMap.put("deliveryMode", "分娩方式");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java View file @ a15758d
... ... @@ -54,6 +54,13 @@
54 54  
55 55 /**
56 56 * @auther HuJiaqi
  57 + * @createTime 2016年12月23日 09时54分
  58 + * @discription 建档孕周
  59 + */
  60 + private String buildWeek;
  61 +
  62 + /**
  63 + * @auther HuJiaqi
57 64 * @createTime 2016年12月07日 16时38分
58 65 * @discription 分娩方式
59 66 */
... ... @@ -1079,6 +1086,14 @@
1079 1086  
1080 1087 public void setDeliveryMode1(String deliveryMode1) {
1081 1088 this.deliveryMode1 = deliveryMode1;
  1089 + }
  1090 +
  1091 + public String getBuildWeek() {
  1092 + return buildWeek;
  1093 + }
  1094 +
  1095 + public void setBuildWeek(String buildWeek) {
  1096 + this.buildWeek = buildWeek;
1082 1097 }
1083 1098 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java View file @ a15758d
... ... @@ -96,6 +96,27 @@
96 96  
97 97 // 分娩孕周
98 98  
  99 + //建档孕周
  100 + String dueWeek = "";
  101 + try {
  102 + if (patients.getBookbuildingDate().getTime() - patients.getDueDate().getTime() > 0 && patients.getBuildType() == 2) {
  103 +// if (patients.getBookbuildingDate().getTime() - patients.getFmDate().getTime() > 0 && patients.getBuildType() == 2) {
  104 + dueWeek = "已分娩";
  105 + } else {
  106 + int days = DateUtil.daysBetween(patients.getLastMenses(), patients.getBookbuildingDate());
  107 + if (days > 7 * 42 - 1) {
  108 + dueWeek = "已分娩";
  109 + } else {
  110 + String week = (days / 7) + "";
  111 + int day = (days % 7);
  112 + dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : "");
  113 + }
  114 + }
  115 + } catch (Exception e) {
  116 + // 什么都不干
  117 + }
  118 + childbirthManagerQueryModel.setBuildWeek(dueWeek);
  119 +
99 120 // 分娩日期
100 121 childbirthManagerQueryModel.setDueDate(DateUtil.getyyyy_MM_dd(patients.getFmDate()));
101 122 // name