jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 2cb50e5adade82a03a9d2455447060cd1296922e

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

update

Showing 4 changed files with 23 additions and 14 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/BabySieveQhdModel.java View file @ 2cb50e5
... ... @@ -2,8 +2,10 @@
2 2  
3 3 import com.lyms.platform.beans.SerialIdEnum;
4 4 import com.lyms.platform.common.enums.FmTypeEnums;
  5 +import com.lyms.platform.common.enums.SexEnum;
5 6 import com.lyms.platform.common.result.BaseModel;
6 7 import com.lyms.platform.common.utils.DateUtil;
  8 +import com.lyms.platform.common.utils.StringUtils;
7 9 import org.springframework.data.mongodb.core.mapping.Document;
8 10  
9 11 import java.util.Date;
... ... @@ -401,7 +403,6 @@
401 403 map.put("bhnum",bhnum);
402 404 map.put("matdeliverId",matdeliverId);
403 405 map.put("patientId",patientId);
404   - map.put("hospitalId",hospitalId);
405 406 String s = "";
406 407 if("1".equals(sieveStatuseNw)){
407 408 map.put("sieveStatuseNw","已申请");
... ... @@ -463,10 +464,8 @@
463 464 String fmName = FmTypeEnums.getFmNameById(dueType);
464 465 map.put("dueType",fmName);
465 466 }
466   - if("0" == sex){
467   - map.put("sex","男");
468   - }else if("1" == sex){
469   - map.put("sex","女");
  467 + if(StringUtils.isNotEmpty(sex)){
  468 + map.put("sex",SexEnum.getTextById(Integer.parseInt(sex)));
470 469 }
471 470 map.put("diseaseSieve",diseaseSieve);
472 471 if("0".equals(buruSum)){
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java View file @ 2cb50e5
... ... @@ -19,7 +19,9 @@
19 19 import com.lyms.platform.operate.web.utils.LisHandleTask;
20 20 import com.lyms.platform.permission.model.LisReportModel;
21 21 import com.lyms.platform.permission.model.Organization;
  22 +import com.lyms.platform.permission.model.Users;
22 23 import com.lyms.platform.permission.service.OrganizationService;
  24 +import com.lyms.platform.permission.service.UsersService;
23 25 import com.lyms.platform.pojo.*;
24 26 import com.lyms.platform.query.*;
25 27 import com.mchange.v1.util.ListUtils;
26 28  
... ... @@ -71,8 +73,9 @@
71 73 private AntenatalExaminationFacade antenatalExaminationFacade;
72 74 @Autowired
73 75 private BabyService babyService;
  76 + @Autowired
  77 + private UsersService usersService;
74 78  
75   -
76 79 /**
77 80 * 新生儿筛查申请前，查询孕妇是否在本院建档以及是否已经录入分娩记录
78 81 *
... ... @@ -778,7 +781,13 @@
778 781 BaseObjectResponse br = new BaseObjectResponse();
779 782 BabySieveQhdModel bm = babySieveQhdService.findOneBabySieveById(id);
780 783 if (bm != null) {
781   - br.setData(bm.convertToDataModel());
  784 + Map <String, String> map = bm.convertToDataModel();
  785 + map.put("ssHospital",XsescEnums.getYchospitalId(bm.getSsHospital()).getYchospitalName());
  786 + Users user = usersService.getUsers(Integer.valueOf(bm.getCollectDocterId()));
  787 + if (user != null) {
  788 + map.put("collectDocterId",user.getName());
  789 + }
  790 + br.setData(map);
782 791 br.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION);
783 792 return br;
784 793 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabySieveAddQhdRequest.java View file @ 2cb50e5
... ... @@ -94,7 +94,7 @@
94 94 private String dueType;
95 95 //分娩详细方式
96 96 private String duescfs;
97   - //性别 男 女
  97 + //性别 MAN(1, "男"), WOMAN(0, "女"), BM(2, "不明");
98 98 private String sex;
99 99 //35种疾病筛查 0否 1是
100 100 private String diseaseSieve;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabySieveQhdHandleTask.java View file @ 2cb50e5
... ... @@ -69,6 +69,7 @@
69 69 for(MaternalDeliverModel maternalDeliverModel : maternalDeliverModelList){
70 70 for(BabyModel babyModel : babyModelList){
71 71 if(maternalDeliverModel.getParentId().equals(babyModel.getParentId())){
  72 + boolean bb=true;
72 73 BabySieveQhdModel babySieveQhdModel = new BabySieveQhdModel();
73 74 babySieveQhdModel = babySieveQhdService.getBabySieveQueryBybabyId(babyModel.getId());
74 75 BabySieveQhdManager babySieveQhdManager = new BabySieveQhdManager();
... ... @@ -77,7 +78,10 @@
77 78 babySieveQhdManager.setMatdeliverId(maternalDeliverModel.getId());//分娩ID
78 79  
79 80 if(babySieveQhdModel != null){
80   -
  81 + if(StringUtils.isNotEmpty(babySieveQhdModel.getDueType()) && !"{}".equals(babySieveQhdModel.getDueType().replace(" ",""))){
  82 + babySieveQhdManager.setDueType(babySieveQhdModel.getDueType());
  83 + bb = false;
  84 + }
81 85 /*这几个在 产筛申请中获取*/
82 86 if("1".equals(babySieveQhdModel.getCsjg())){
83 87 babySieveQhdManager.setResult("阳性");
84 88  
... ... @@ -129,9 +133,9 @@
129 133 }
130 134 List<MaternalDeliverModel.Baby> babies = maternalDeliverModel.getBaby();
131 135  
132   - //分娩方式
  136 + //分娩记录获取分娩方式，如果儿童筛查有分娩记录就不在使用分娩信息中的分娩信息
133 137 String deliveryMode = "";
134   - if (StringUtils.isNotEmpty(maternalDeliverModel.getDeliveryMode())) {
  138 + if (bb && StringUtils.isNotEmpty(maternalDeliverModel.getDeliveryMode())) {
135 139 StringBuilder sb = new StringBuilder();
136 140 Map m = JsonUtil.str2Obj(maternalDeliverModel.getDeliveryMode(), Map.class);
137 141 String fmfs = null;
... ... @@ -159,9 +163,6 @@
159 163 }
160 164 if (deliveryMode.contains("顺产")) {
161 165 babySieveQhdManager.setDueType(deliveryMode);
162   - } else {
163   - babySieveQhdManager.setDueType(deliveryMode);
164   - babySieveQhdManager.setOperationCause(maternalDeliverModel.getOperationCause() == null ? "--" : maternalDeliverModel.getOperationCause());
165 166 }
166 167  
167 168 if (org.apache.commons.collections.CollectionUtils.isNotEmpty(babies)) {