jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 0dec6fa672a7f1f71e7e85f15019eb6c805342ed

Authored by zhangchao
1 parent 4745e0ef46
Exists in dev

#fix:新增产后康复分娩方式查询

Showing 4 changed files with 58 additions and 4 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/model/FactorProjectEntity.java View file @ 0dec6fa
... ... @@ -5,8 +5,17 @@
5 5 public class FactorProjectEntity {
6 6 private List<String> riskFactorNames;
7 7 private String week;
  8 + private String tips;
8 9 private List<ProjectWay> healthItemList;
9 10 private List<ProjectWay> riskItemList;
  11 +
  12 + public String getTips() {
  13 + return tips;
  14 + }
  15 +
  16 + public void setTips(String tips) {
  17 + this.tips = tips;
  18 + }
10 19  
11 20 public String getWeek() {
12 21 return week;
platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/FactorProjectServiceImpl.java View file @ 0dec6fa
... ... @@ -114,6 +114,7 @@
114 114 if (CollectionUtils.isNotEmpty(projectList)) {
115 115 FactorProjectEntity factorProjectManage = new FactorProjectEntity();
116 116 factorProjectManage.setWeek(week);
  117 + factorProjectManage.setTips(projectList.get(0).getTips());
117 118 List<ProjectWay> healthList = new ArrayList<>();
118 119 List<ProjectWay> riskList = new ArrayList<>();
119 120 List<String> riskFactorNames = new ArrayList<>();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ 0dec6fa
... ... @@ -33,10 +33,7 @@
33 33 import com.lyms.platform.permission.service.OrganizationService;
34 34 import com.lyms.platform.permission.service.UsersService;
35 35 import com.lyms.platform.pojo.*;
36   -import com.lyms.platform.query.AntExChuQuery;
37   -import com.lyms.platform.query.BabyModelQuery;
38   -import com.lyms.platform.query.DataPermissionsModelQuery;
39   -import com.lyms.platform.query.PatientsQuery;
  36 +import com.lyms.platform.query.*;
40 37 import org.apache.commons.collections.CollectionUtils;
41 38 import org.apache.commons.collections.Transformer;
42 39 import org.slf4j.Logger;
... ... @@ -3734,6 +3731,42 @@
3734 3731 patientQueryRequest.getVcCardNo(), patientQueryRequest.getId(), groupsFacade.findGroupHospital(userId, false), type, false, patientQueryRequest.getPid(), false);
3735 3732 PatientBaseResult patientBaseResult = new PatientBaseResult();
3736 3733 if (null != patients) {
  3734 + if (type==3){
  3735 + MatDeliverQuery deliverQuery=new MatDeliverQuery();
  3736 + deliverQuery.setYn(1);
  3737 + deliverQuery.setParentId(patients.getId());
  3738 + List<MaternalDeliverModel> modelList=matDeliverService.query(deliverQuery);
  3739 +
  3740 + String deliveryMode = "";
  3741 + if (org.apache.commons.lang.StringUtils.isNotEmpty(modelList.get(0).getDeliveryMode())) {
  3742 +
  3743 + StringBuilder sb = new StringBuilder();
  3744 + Map m = JsonUtil.str2Obj(modelList.get(0).getDeliveryMode(), Map.class);
  3745 + String fmfs = null;
  3746 + if (m != null) {
  3747 + Object b = m.get("fmfs");
  3748 + if (b != null) {
  3749 + fmfs = b.toString();
  3750 + if (fmfs != null) {
  3751 + if (fmfs.equals("1")) {
  3752 + String fmName = FmTypeEnums.getFmNameById(fmfs);
  3753 + sb.append(fmName);
  3754 + if (null != m.get("scfs") && !"null".equals(m.get("scfs").toString())) {
  3755 + sb.append(",");
  3756 + String scfs = m.get("scfs").toString();
  3757 + sb.append(FmTypeEnums.getFmScNameById(scfs));
  3758 + }
  3759 + deliveryMode = sb.toString();
  3760 + } else if (fmfs.equals("2")) {
  3761 + String fmName = FmTypeEnums.getFmNameById(fmfs);
  3762 + deliveryMode = fmName;
  3763 + }
  3764 + }
  3765 + }
  3766 + }
  3767 + }
  3768 + patients.setFmType(deliveryMode);
  3769 + }
3737 3770 patientBaseResult.convert(patients);
3738 3771 }
3739 3772 try {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java View file @ 0dec6fa
... ... @@ -69,7 +69,16 @@
69 69 private String bmi;
70 70 //户籍地址
71 71 private String maddress;
  72 + private String deliveryMode;
72 73  
  74 + public String getDeliveryMode() {
  75 + return deliveryMode;
  76 + }
  77 +
  78 + public void setDeliveryMode(String deliveryMode) {
  79 + this.deliveryMode = deliveryMode;
  80 + }
  81 +
73 82 public String getMaddress() {
74 83 return maddress;
75 84 }
76 85  
... ... @@ -284,8 +293,10 @@
284 293 if (null != patients.getFmDate()) {
285 294 //1 孕妇 0 产妇
286 295 setIsGravida("0");
  296 + setDeliveryMode(patients.getFmType());
287 297 } else {
288 298 setIsGravida("1");
  299 +
289 300 }
290 301 setBirth(DateUtil.getyyyy_MM_dd(patients.getBirth()));
291 302