liquanyu / regional-platform

Download as
Browse Code »

Commit 4470021b115b5710e5eb7b287179fd67a99be85b

Authored by yangfei
2 parents 1f011f4cff 4785904289
Exists in master and in 1 other branch dev

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java

Showing 6 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 4470021
... ... @@ -1227,6 +1227,7 @@
1227 1227 */
1228 1228 private BabyBuildResult getBabyBuildResult(BabyModel model) {
1229 1229 BabyBuildResult result = new BabyBuildResult();
  1230 + result.setFileCode(model.getFileCode());
1230 1231 result.setmHighRiskReason(mongoUtil.findColor(model.getmHighRiskReason()));
1231 1232 result.setBabyHighRiskReason(mongoUtil.findColor(model.getBabyHighRiskReason()));
1232 1233  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 4470021
... ... @@ -1993,7 +1993,22 @@
1993 1993 szy = chBpMap.get("szy");
1994 1994 }
1995 1995 map.put("bp", UnitUtils.unitSplice(ssy + "/" + szy, UnitConstants.MMHG));
1996   - map.put("gongGao", StringUtils.isNumeric(data.getGongGao()) ? UnitUtils.unitSplice(data.getGongGao(), UnitConstants.CM) : data.getGongGao() == null ? "" : data.getGongGao());
  1996 +
  1997 + String gongGao = "";
  1998 + if (StringUtils.isNotEmpty(data.getGongGaoSelect()) )
  1999 + {
  2000 + if (StringUtils.isNotEmpty(data.getGongGaoType())) {
  2001 + gongGao = GongJingEnums.getGongGaoNameById(data.getGongGaoSelect()) + "，" + GongJingEnums.getHengZhiNameById(data.getGongGaoType());
  2002 + } else {
  2003 + gongGao = GongJingEnums.getGongGaoNameById(data.getGongGaoSelect());
  2004 + }
  2005 + }
  2006 + else if (StringUtils.isNotEmpty(data.getGongGao()))
  2007 + {
  2008 + gongGao = UnitUtils.unitSplice(data.getGongGao(), UnitConstants.CM);
  2009 + }
  2010 +
  2011 + map.put("gongGao", gongGao);
1997 2012  
1998 2013 if (StringUtils.isNotEmpty(data.getGongGaoSelect())) {
1999 2014 map.put("gongGaoSelect", GongJingEnums.getGongGaoNameById(data.getGongGaoSelect()));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarBase.java View file @ 4470021
... ... @@ -128,6 +128,9 @@
128 128 private Integer serviceStatus;
129 129 //服务类型
130 130 private Integer serviceType;
  131 +
  132 + //滦平儿童档案编号
  133 + private String fileCode;
131 134 /**
132 135 * 服务信息
133 136 */
... ... @@ -138,6 +141,7 @@
138 141 private String monthAge;
139 142  
140 143 public BabyEarBase(BabyModel babyModel) {
  144 + setFileCode(babyModel.getFileCode());
141 145 setBabyId(babyModel.getId());
142 146 setPid(babyModel.getPid());
143 147 setName(babyModel.getName());
144 148  
... ... @@ -228,10 +232,20 @@
228 232 babyModel.setFphone(fphone);
229 233 babyModel.setFbirth(DateUtil.parseYMD(fbirth));
230 234 babyModel.setFproTypeId(fproTypeId);
  235 + babyModel.setFileCode(fileCode);
231 236 return babyModel;
232 237 }
233 238 public BabyEarBase() {
234 239  
  240 + }
  241 +
  242 +
  243 + public String getFileCode() {
  244 + return fileCode;
  245 + }
  246 +
  247 + public void setFileCode(String fileCode) {
  248 + this.fileCode = fileCode;
235 249 }
236 250  
237 251 public List<PatientSerResult> getPatientSerResults() {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java View file @ 4470021
... ... @@ -192,6 +192,17 @@
192 192  
193 193 private String couponCode;
194 194  
  195 + //档案编号 滦平需求
  196 + private String fileCode;
  197 +
  198 + public String getFileCode() {
  199 + return fileCode;
  200 + }
  201 +
  202 + public void setFileCode(String fileCode) {
  203 + this.fileCode = fileCode;
  204 + }
  205 +
195 206 public String getCouponCode() {
196 207 return couponCode;
197 208 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java View file @ 4470021
... ... @@ -57,6 +57,17 @@
57 57 //详情
58 58 private String detail;
59 59  
  60 + //转诊状态 0转诊 1待接收 2已转出
  61 + private Integer referralStatus;
  62 +
  63 + public Integer getReferralStatus() {
  64 + return referralStatus;
  65 + }
  66 +
  67 + public void setReferralStatus(Integer referralStatus) {
  68 + this.referralStatus = referralStatus;
  69 + }
  70 +
60 71 public String getCsRemarkTypeId() {
61 72 return csRemarkTypeId;
62 73 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveWorker.java View file @ 4470021
... ... @@ -82,14 +82,30 @@
82 82 sieveListResult.setAge(DateUtil.getAge(patients.getBirth()) + "岁");
83 83 }
84 84  
85   -// ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery();
86   -// referralApplyOrderQuery.setType(2);
87   -// referralApplyOrderQuery.setParentId(sieveModel.getParentId());
88   -// List<ReferralApplyOrderModel> orderModels = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery);
89   -// if (CollectionUtils.isNotEmpty(orderModels))
90   -// {
91   -//
92   -// }
  85 + //转诊状态 0转诊 1待接收 2已转出
  86 + Integer referralStatus = 0;
  87 +
  88 + ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery();
  89 + referralApplyOrderQuery.setType(2);
  90 + referralApplyOrderQuery.setParentId(sieveModel.getParentId());
  91 + referralApplyOrderQuery.setOutHospitalId(hospitalId);
  92 + List<ReferralApplyOrderModel> orderModels = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery);
  93 + if (CollectionUtils.isNotEmpty(orderModels))
  94 + {
  95 + ReferralApplyOrderModel model = orderModels.get(0);
  96 + //申请单状态 0 已接收 1 已转出 2 建议转诊
  97 + Integer status = model.getStatus();
  98 + if (status == 1)
  99 + {
  100 + referralStatus = 2;
  101 + }
  102 + else if (status == 0)
  103 + {
  104 + referralStatus = 1;
  105 + }
  106 + }
  107 +
  108 + sieveListResult.setReferralStatus(referralStatus);
93 109  
94 110  
95 111 results.add(sieveListResult);