jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 94becd84c82f52bfe60f53db23de03186104bd5a

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

新筛修改

Showing 4 changed files with 42 additions and 5 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/BabySieveModel.java View file @ 94becd8
1 1 package com.lyms.platform.pojo;
2 2  
3 3 import com.lyms.platform.beans.SerialIdEnum;
  4 +import com.lyms.platform.common.enums.FmTypeEnums;
4 5 import com.lyms.platform.common.result.BaseModel;
5 6 import com.lyms.platform.common.utils.DateUtil;
  7 +import org.apache.commons.lang.StringUtils;
6 8 import org.springframework.data.mongodb.core.mapping.Document;
7 9  
8 10 import java.util.Date;
9 11  
... ... @@ -319,11 +321,22 @@
319 321 map.put("babyBirth",DateUtil.getYMDH(babyBirth)+":00");
320 322 map.put("babyName",babyName);
321 323 map.put("dueWeek",dueWeek);
322   - map.put("dueType",dueType);
323   - map.put("duescfs",duescfs);
324   - if(sex != null){
325   - map.put("sex",String.valueOf(sex));
  324 + if("1".equals(dueType)){
  325 + String fmName = FmTypeEnums.getFmNameById(dueType);
  326 + fmName+=","+FmTypeEnums.getFmScNameById(duescfs);
  327 + map.put("dueType",fmName);
  328 + }else if("2".equals(dueType)){
  329 + String fmName = FmTypeEnums.getFmNameById(dueType);
  330 + map.put("dueType",fmName);
326 331 }
  332 + if(0 == sex){
  333 + map.put("sex","男");
  334 + }else if(1 == sex){
  335 + map.put("sex","女");
  336 + }
  337 + /*if(sex != null){
  338 + map.put("sex",String.valueOf(sex));
  339 + }*/
327 340 map.put("diseaseSieve",diseaseSieve);
328 341 map.put("sendCheckHospitalId",sendCheckHospitalId);
329 342 map.put("babyId",babyId);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java View file @ 94becd8
... ... @@ -286,6 +286,7 @@
286 286 }
287 287 }
288 288 //babyModelQuery.setDataStatus(false);
  289 + babyModelQuery.setYn(0);
289 290 babyModelQuery.setDeformityKey(babySieveAddRequest.getDeformityKey());
290 291 babyModelQuery.setDueType(StringUtils.isEmpty(babySieveAddRequest.getDueType()) ? null : babySieveAddRequest.getDueType());
291 292 if("0".equals(babySieveAddRequest.getSieveStatus())){
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabySieveResult.java View file @ 94becd8
... ... @@ -37,6 +37,8 @@
37 37 private Integer age;
38 38 //孕周
39 39 private String dueWeek;
  40 + //当前孕周
  41 + private String nowWeeks;
40 42 //预产期
41 43 private String yChanQi;
42 44 //备注
... ... @@ -218,6 +220,14 @@
218 220 this.adress = adress;
219 221 }
220 222  
  223 + public String getNowWeeks() {
  224 + return nowWeeks;
  225 + }
  226 +
  227 + public void setNowWeeks(String nowWeeks) {
  228 + this.nowWeeks = nowWeeks;
  229 + }
  230 +
221 231 public BabySieveResult convert(Patients pat){
222 232 setId(pat.getId());
223 233 try {
... ... @@ -237,6 +247,8 @@
237 247 if (null != pat.getLastMenses()) {
238 248 /*int days = DateUtil.daysBetween(pat.getLastMenses(), new Date());
239 249 this.dueWeek = StringUtils.dueWeek(days);*/
  250 + int days = DateUtil.daysBetween(pat.getLastMenses(), new Date());
  251 + this.nowWeeks = StringUtils.dueWeek(days);
240 252  
241 253 setLastMenses(DateUtil.getyyyy_MM_dd(pat.getLastMenses()));
242 254 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabySieveHandleTask.java View file @ 94becd8
... ... @@ -4,6 +4,7 @@
4 4 import com.lyms.platform.biz.service.BasicConfigService;
5 5 import com.lyms.platform.biz.service.MatDeliverService;
6 6 import com.lyms.platform.biz.service.PatientsService;
  7 +import com.lyms.platform.common.enums.FmTypeEnums;
7 8 import com.lyms.platform.common.enums.SexEnum;
8 9 import com.lyms.platform.common.enums.YnEnums;
9 10 import com.lyms.platform.common.utils.DateUtil;
... ... @@ -76,6 +77,15 @@
76 77 babySieveManager.setMatdeliverId(maternalDeliverModel.getId());
77 78 if(babySieveModel != null){
78 79 babySieveManager.setId(babySieveModel.getId());
  80 + if("1".equals(babySieveModel.getDueType())){
  81 + String fmName = FmTypeEnums.getFmNameById(babySieveModel.getDueType());
  82 + fmName+=","+FmTypeEnums.getFmScNameById(babySieveModel.getDuescfs());
  83 + babySieveManager.setDueType(fmName);
  84 + }else if("2".equals(babySieveModel.getDueType())){
  85 + String fmName = FmTypeEnums.getFmNameById(babySieveModel.getDueType());
  86 + babySieveManager.setDueType(fmName);
  87 + }
  88 +
79 89 }
80 90 //获取母亲基本信息
81 91 Patients patients = patientsService.findOnePatientById(babyModel.getParentId());
... ... @@ -91,7 +101,8 @@
91 101 String jzShi = CommonsHelper.getName1(patients.getCityRegisterId(), basicConfigService);
92 102 String jzXian = CommonsHelper.getName1(patients.getAreaRegisterId(), basicConfigService);
93 103 String jzXiang = CommonsHelper.getName1(patients.getStreetRegisterId(), basicConfigService);
94   - String jQquan = jzSheng+jzShi+jzXian+jzXiang;
  104 + String address = patients.getAddress();
  105 + String jQquan = jzSheng+jzShi+jzXian+jzXiang+address;
95 106 babySieveManager.setAdress(jQquan);
96 107 babySieveManager.setPatientId(patients.getId());
97 108 babySieveManager.setCardNo(patients.getCardNo());