From e93db3048bbd532cf26beb26bf7a063c85e96d1d Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 14 Oct 2020 11:55:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E8=A5=BF=E4=BD=93=E9=87=8D=E6=8A=A5?= =?UTF-8?q?=E5=91=8A=E5=AE=9A=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/operate/web/facade/ViewFacade.java | 2 +- .../web/service/impl/PatientWeightServiceImpl.java | 16 ++++++++++------ 2 files changed, 11 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 ffc2b74..f1d7747 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 @@ -6764,7 +6764,7 @@ public class ViewFacade { patientMap.put("maddress", CommonsHelper.getResidence(pat.getProvinceId(), pat.getCityId(), pat.getAreaId(), pat.getStreetId(), pat.getAddress(), basicConfigService));//母亲户籍地址 - if (StringUtils.isNotEmpty(pat.getHusbandName())) { + if (StringUtils.isNotEmpty(pat.getHusbandName()) && !pat.getReqHusband()) { patientMap.put("fname", StringUtils.isNotEmpty(pat.getHusbandName()) ? pat.getHusbandName() : "");//父亲姓名 patientMap.put("fcountry", getBasicConfig(pat.getHcountryId()));//父亲国籍 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java index ae680e7..57d715d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java @@ -1485,11 +1485,12 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient String hospitalId = kmap.get("hospitalId"); String kcal = ""; //临西热量计算 - if (StringUtils.isNotEmpty(hospitalId) && "216".equals(hospitalId)) + if (StringUtils.isNotEmpty(hospitalId) && "2100001306".equals(hospitalId) && "1500".equals(kmap.get("kulStart"))) { - kcal = Math.round(Double.parseDouble(kmap.get("kulStart")))+""; + kcal = Math.round(Double.parseDouble(kmap.get("kulStart")))+""; } - else { + else + { kcal = Math.round(Double.parseDouble(kmap.get("kulStart"))) + "-" + Math.round(Double.parseDouble(kmap.get("kulEnd"))); } @@ -2060,10 +2061,13 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient } String hospitalId = map.get("hospitalId"); //临西热量计算 - if (StringUtils.isNotEmpty(hospitalId) && "216".equals(hospitalId)) + if (StringUtils.isNotEmpty(hospitalId) && "2100001306".equals(hospitalId)) { - map.put("kulStart","1500"); - k1 = k1 < 1500 ? 1500 : k1; + if (k1 < 1500) + { + map.put("kulStart","1500"); + k1 = 1500; + } } Criteria criteria = null; -- 1.8.3.1