From 6f48f3ebfbbd3e617c8bc0107cb9511c1fff04a7 Mon Sep 17 00:00:00 2001 From: "litao@lymsh.com" Date: Wed, 23 Aug 2017 20:33:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=84=E7=90=86=E6=84=8F?= =?UTF-8?q?=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/lyms/platform/pojo/AntExChuModel.java | 11 +++++++++++ .../lyms/platform/pojo/AntenatalExaminationModel.java | 11 +++++++++++ .../operate/web/facade/AntenatalExaminationFacade.java | 6 ++++++ .../lyms/platform/operate/web/facade/ViewFacade.java | 5 +++-- .../platform/operate/web/request/AntExAddRequest.java | 14 ++++++++++++++ .../platform/operate/web/request/AntExcAddRequest.java | 14 ++++++++++++++ .../operate/web/result/AntenatalExaminationResult.java | 11 +++++++++++ .../platform/operate/web/result/AntexChuResult.java | 11 +++++++++++ .../platform/operate/web/result/AntexListResult.java | 12 ++++++++++++ .../com/lyms/platform/operate/web/utils/MongoUtil.java | 17 +++++++++++++++++ 10 files changed, 110 insertions(+), 2 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java index 5461a11..c8b0ce5 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java @@ -16,6 +16,9 @@ import java.util.List; public class AntExChuModel extends BaseModel { private static final long serialVersionUID = SerialIdEnum.AntExChuModel.getCid(); + + private List treatmentOpinion2; + //条码 private String barCode; private String id; @@ -169,6 +172,14 @@ public class AntExChuModel extends BaseModel { //浮肿 private String edema; + public List getTreatmentOpinion2() { + return treatmentOpinion2; + } + + public void setTreatmentOpinion2(List treatmentOpinion2) { + this.treatmentOpinion2 = treatmentOpinion2; + } + public String getEdema() { return edema; } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java index 728f4ee..c4b2f35 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java @@ -17,6 +17,9 @@ public class AntenatalExaminationModel extends BaseModel { private static final long serialVersionUID = SerialIdEnum.AntenatalExaminationModel.getCid(); + /**处理意见*/ + private List treatmentOpinion2; + private String id; private String barCode; private String pid; @@ -129,6 +132,14 @@ public class AntenatalExaminationModel extends BaseModel { //甲状腺功能 private String jzxgn; + public List getTreatmentOpinion2() { + return treatmentOpinion2; + } + + public void setTreatmentOpinion2(List treatmentOpinion2) { + this.treatmentOpinion2 = treatmentOpinion2; + } + public String getZyqbd() { return zyqbd; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index e2c2282..c1e2039 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -12,6 +12,7 @@ import com.lyms.platform.common.utils.SystemConfig; import com.lyms.platform.operate.web.request.*; import com.lyms.platform.operate.web.result.*; import com.lyms.platform.operate.web.utils.InitDataUtils; +import com.lyms.platform.operate.web.utils.MongoUtil; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.service.CouponService; @@ -79,6 +80,9 @@ public class AntenatalExaminationFacade { private SieveService sieveService; @Autowired private DischargeAbstractMotherService dischargeAbstractMotherService; + @Autowired + private MongoUtil mongoUtil; + /** * 处理区域隐藏建档 * @@ -2091,6 +2095,7 @@ public class AntenatalExaminationFacade { } antenatalExaminationResult.setCheckDoctor(map1); } + antenatalExaminationResult.setExaminationModel2(mongoUtil.findPlatValueList(examinationModel.getTreatmentOpinion2())); antenatalExaminationResult.setIsSieve(cap(data, examinationModel.getParentId())); antenatalExaminationResult.setHasSieve(CollectionUtils.isEmpty(applyOrderService.querySieveApplyOrderWithQuery(applyOrderQuery)) ? 0 : 1); object = antenatalExaminationResult; @@ -2140,6 +2145,7 @@ public class AntenatalExaminationFacade { applyOrderQuery.setYn(YnEnums.YES.getId()); antexChuResult.setHasSieve(CollectionUtils.isEmpty(applyOrderService.querySieveApplyOrderWithQuery(applyOrderQuery)) ? 0 : 1); antexChuResult.setIsSieve(cap(antExChuModel.getLastMenses(), antExChuModel.getParentId())); + antexChuResult.setTreatmentOpinion2(mongoUtil.findPlatValueList(antExChuModel.getTreatmentOpinion2())); object = antexChuResult; } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index f3206eb..cd38aff 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -79,6 +79,8 @@ public class ViewFacade { @Autowired private CouponService couponService; + @Autowired + private MongoUtil mongoUtil; /** * 建档查询 @@ -1793,8 +1795,7 @@ public class ViewFacade { map.put("s75gdgtt", Boolean.valueOf(data.getS75gdgtt()) ? "已检查" : "未检查"); map.put("jzxgn", Boolean.valueOf(data.getJzxgn()) ? "已检查" : "未检查"); - - + map.put("treatmentOpinion2", mongoUtil.findPlatValueList(data.getTreatmentOpinion2())); //早孕期病毒检测 // private String zyqbdjc; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java index dbc9c2f..549baeb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java @@ -15,6 +15,9 @@ import java.util.Map; */ @Form public class AntExAddRequest implements IBasicRequestConvert { + /** 处理意见 */ + private List treatmentOpinion2; + // 访视记录id private String id; @@ -82,6 +85,8 @@ public class AntExAddRequest implements IBasicRequestConvert getTreatmentOpinion2() { + return treatmentOpinion2; + } + + public void setTreatmentOpinion2(List treatmentOpinion2) { + this.treatmentOpinion2 = treatmentOpinion2; + } + public String getZyqbdjc() { return zyqbdjc; } @@ -256,6 +269,7 @@ public class AntExAddRequest implements IBasicRequestConvert { + + + + private List treatmentOpinion2; + + public List getTreatmentOpinion2() { + return treatmentOpinion2; + } + + public void setTreatmentOpinion2(List treatmentOpinion2) { + this.treatmentOpinion2 = treatmentOpinion2; + } + @FormParam @NotEmpty(message = "孕妇id不能为空") private String parentId; @@ -1184,6 +1197,7 @@ public class AntExcAddRequest implements IBasicRequestConvert { @Override public AntExChuModel convertToDataModel() { AntExChuModel antExChuModel = new AntExChuModel(); + antExChuModel.setTreatmentOpinion2(treatmentOpinion2); antExChuModel.setAntExcAddOthers(antExcAddOthers); antExChuModel.setSurvFetus(survFetus); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java index 3c42b47..d98e567 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java @@ -14,6 +14,9 @@ import java.util.Map; * Created by Administrator on 2016/6/15 0015. */ public class AntenatalExaminationResult implements IBasicResultConvert { + + private List> examinationModel2; + private String barCode; private String id; private String isSieve; @@ -102,6 +105,14 @@ public class AntenatalExaminationResult implements IBasicResultConvert> getExaminationModel2() { + return examinationModel2; + } + + public void setExaminationModel2(List> examinationModel2) { + this.examinationModel2 = examinationModel2; + } + public String getGongGaoSelect() { return gongGaoSelect; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java index f35647e..11071e9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java @@ -14,6 +14,9 @@ import java.util.Map; * Created by Administrator on 2016/6/20 0020. */ public class AntexChuResult { + + private List> treatmentOpinion2; + private String barCode; public String getBarCode() { @@ -289,6 +292,14 @@ public class AntexChuResult { //浮肿 private String edema; + public List> getTreatmentOpinion2() { + return treatmentOpinion2; + } + + public void setTreatmentOpinion2(List> treatmentOpinion2) { + this.treatmentOpinion2 = treatmentOpinion2; + } + public String getEdema() { return edema; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java index c4f7f2d..85cbc3a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java @@ -9,6 +9,7 @@ import com.lyms.platform.pojo.Patients; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Map; /** * 产前筛查列表返回对象 @@ -19,6 +20,9 @@ public class AntexListResult { private String id; + /** 处理意见 */ + private List> treatmentOpinion2; + private String pid; //名字 private String name; @@ -53,6 +57,14 @@ public class AntexListResult { // + public List> getTreatmentOpinion2() { + return treatmentOpinion2; + } + + public void setTreatmentOpinion2(List> treatmentOpinion2) { + this.treatmentOpinion2 = treatmentOpinion2; + } + public String getPid() { return pid; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java index 096abed..c51dad8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java @@ -297,4 +297,21 @@ public class MongoUtil { } return rest; } + + public List> findPlatValueList(List ids) { + if(CollectionUtils.isNotEmpty(ids)) { + return null; + } + List> rest = new ArrayList<>(); + for (String id : ids) { + PlantformConfigModel platformConfig = getPlatformConfig(id); + if(platformConfig != null) { + Map tempMap = new HashedMap(); + tempMap.put("id", platformConfig.getId()); + tempMap.put("name", platformConfig.getValue()); + rest.add(tempMap); + } + } + return rest; + } } -- 1.8.3.1