diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyFmService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyFmService.java index 40c19e5..b629a7b 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyFmService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyFmService.java @@ -276,7 +276,9 @@ public class QhdfyFmService { if (patInfo != null && (StringUtils.isNotEmpty(patInfo.getPhone()) || StringUtils.isNotEmpty(patInfo.getCardNo()))) { PatientsQuery query = new PatientsQuery(); query.setYn(YnEnums.YES.getId()); - query.setType(1); //孕妇 + query.setDesc(" desc"); + query.setSort(" created "); + //query.setType(1); //孕妇 query.setDueStatus(0); //未终止妊娠 ExceptionUtils.catchException("phone="+patInfo.getPhone()+" cardNo="+ patInfo.getCardNo()); String[] strs = new String[]{patInfo.getPhone(),patInfo.getCardNo()}; @@ -473,7 +475,9 @@ public class QhdfyFmService { { PatientsQuery query = new PatientsQuery(); query.setYn(YnEnums.YES.getId()); - query.setType(1); //孕妇 + query.setDesc(" desc"); + query.setSort(" created "); + //query.setType(1); //孕妇 query.setDueStatus(0); //未终止妊娠 String[] strs = new String[]{patInfo.getPhone(),patInfo.getCardNo()}; query.setPc(strs); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java index c995ce3..dab568e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java @@ -732,6 +732,7 @@ public class MeasureInfoFacade { beforeWeight = weight.getBeforeWeight() == null ? "" : weight.getBeforeWeight(); beforeHeight = weight.getBeforeHeight() == null ? "" : weight.getBeforeHeight(); lastWeight = weight.getNowWeight() == null ? "" : weight.getNowWeight(); + tireNumber = weight.getBregmatic() == null ? "" : (Integer.valueOf(weight.getBregmatic()) < 3 ? weight.getBregmatic() : weight.getBregmaticOther()); } else { @@ -827,7 +828,7 @@ public class MeasureInfoFacade { else { patientWeight.setBregmatic(3+""); - patientWeight.setBeforeWeight(nutritionInfoRequest.getTireNumber()); + patientWeight.setBregmaticOther(nutritionInfoRequest.getTireNumber()); } dayWeights.put(DateUtil.getyyyy_MM_dd(new Date()), currentWeight);