From 0bf92856cba1079ed80c26ef1b8e7895cf7e896b Mon Sep 17 00:00:00 2001 From: landong2015 Date: Wed, 18 Jan 2017 14:40:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E9=99=A2=E5=B0=8F=E7=BB=93=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3,=E9=AA=8C=E8=AF=81baby=E6=98=AF=E5=90=A6=E6=9C=89?= =?UTF-8?q?=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/ViewFacade.java | 34 +++++++++++++++++----- .../platform/operate/web/utils/FunvCommonUtil.java | 17 +++++++++++ 2 files changed, 44 insertions(+), 7 deletions(-) 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 bd11467..eed3e60 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 @@ -14,6 +14,7 @@ import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.*; +import com.lyms.platform.query.BabyModelQuery; import com.lyms.platform.query.DischargeAbstractBabyQuery; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.MapUtils; @@ -51,6 +52,8 @@ public class ViewFacade { private DischargeAbstractMotherService dischargeAbstractMotherService; @Autowired private DischargeAbstractBabyService dischargeAbstractBabyService; + @Autowired + private BabyService babyService; public BaseObjectResponse findPatientData(String id) { @@ -203,7 +206,7 @@ public class ViewFacade { map.put("highRisk",highScoreResult); Map otherRisk = new HashMap<>(); - if (StringUtils.isNotEmpty(data.getOtherHighRisk())){ + if (StringUtils.isNotEmpty(data.getOtherHighRisk()) && !"{}".equals(data.getOtherHighRisk())){ ResolveUtils.queryOtherRisk(data.getOtherHighRisk(),otherRisk,basicConfigService); } map.put("otherHighRisk",otherRisk); @@ -425,7 +428,7 @@ public class ViewFacade { } map.put("ydfmw",ydfmw); - map.put("ydqjd",ydqjd); + map.put("ydqjd",FunvCommonUtil.getBaseicConfigByid(ydqjd,basicConfigService)); map.put("bChao",data.getbChao()); @@ -495,7 +498,7 @@ public class ViewFacade { map.put("id",data.getId()); map.put("username",patients.getUsername()); map.put("birth",DateUtil.getyyyy_MM_dd(patients.getBirth())); - map.put("age",DateUtil.getAge(patients.getBirth())); + map.put("age",UnitUtils.unitSplice(DateUtil.getAge(patients.getBirth()),UnitConstants.SUI)); map.put("phone",patients.getPhone()); map.put("fmWeek",patients.getFmWeek()); map.put("dueDate",DateUtil.getyyyy_MM_dd(patients.getDueDate())); @@ -511,7 +514,7 @@ public class ViewFacade { map.put("highRisk",highScoreResult); Map otherRisk = new HashMap<>(); - if (StringUtils.isNotEmpty(data.getOtherRisk())){ + if (StringUtils.isNotEmpty(data.getOtherRisk()) && !"{}".equals(data.getOtherRisk())){ ResolveUtils.queryOtherRisk(data.getOtherRisk(),otherRisk,basicConfigService); } map.put("otherHighRisk",otherRisk); @@ -1110,7 +1113,6 @@ public class ViewFacade { return br; } - DischargeAbstractMotherModel data = dischargeAbstractMotherService.findOneById(id); if (data==null){ br.setErrorcode(ErrorCodeConstants.NO_DATA); @@ -1150,7 +1152,14 @@ public class ViewFacade { map.put("riskScore",UnitUtils.unitSplice(patients.getRiskScore(),UnitConstants.FEN)); map.put("leaveHospitalDate", DateUtil.getyyyy_MM_dd(data.getLeaveHospitalDate())); map.put("afterMakeBabyDays", data.getAfterMakeBabyDays()==null?"":"产后"+data.getAfterMakeBabyDays()+"天"); - map.put("inputMan",data.getInputMan()); + String inputMan = ""; + if (StringUtils.isNotEmpty(data.getInputMan()) && FunvCommonUtil.isNumeric(data.getInputMan())){ + Users users = usersService.getUsers(Integer.parseInt(data.getInputMan())); + if (users!=null && users.getYn()==YnEnums.YES.getId()){ + inputMan = users.getName(); + } + } + map.put("inputMan",inputMan); /* 出院信息 */ map.put("description",data.getDescription()); @@ -1161,6 +1170,18 @@ public class ViewFacade { List babyModelList = dischargeAbstractBabyService.query(babyQuery); if (CollectionUtils.isNotEmpty(babyModelList)){ for (DischargeAbstractBabyModel temp : babyModelList){ + if (temp.getpId()==null){ + continue; + } + BabyModelQuery babyModelQuery = new BabyModelQuery(); + babyModelQuery.setYn(YnEnums.YES.getId()); + babyModelQuery.setPid(temp.getpId()); + babyModelQuery.setPregnancyOut(RenShenJieJuEnums.O.getId()); + List babyModels = babyService.queryBabyWithQuery(babyModelQuery); + if (CollectionUtils.isEmpty(babyModels)){ + continue; + } + Map babyMap = new HashMap<>(); babyMap.put("description",temp.getDescription()); babyMap.put("birthCertificateId",temp.getBirthCertificateId()); @@ -1191,7 +1212,6 @@ public class ViewFacade { } } map.put("babys",babys); - br.setErrorcode(ErrorCodeConstants.SUCCESS); br.setErrormsg("成功"); br.setData(map); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/FunvCommonUtil.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/FunvCommonUtil.java index b0b43dc..13e7f9f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/FunvCommonUtil.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/FunvCommonUtil.java @@ -12,6 +12,8 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.math.NumberUtils; import java.util.*; +import java.util.regex.Matcher; +import java.util.regex.Pattern; /** * 妇女模块公共方法 @@ -113,6 +115,21 @@ public class FunvCommonUtil { } /** + * 判断是否为数字 + * @param str + * @return + */ + public static boolean isNumeric(String str){ + Pattern pattern = Pattern.compile("[0-9]*"); + Matcher isNum = pattern.matcher(str); + if( !isNum.matches() ){ + return false; + } + return true; + } + + + /** * 获取生日(****年**月**日) * @param b * @return -- 1.8.3.1