diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/DzfyFmService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/DzfyFmService.java index 9dead4b..89eaffc 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/DzfyFmService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/DzfyFmService.java @@ -626,8 +626,8 @@ public class DzfyFmService { request.setMalformation((fm.getBABY_DEFORMITY() == null ? 0 : 1)); //畸形 0非畸形 1畸形 //request.setMalformation("无".equals(item.getJx()) ? 0 : 1); //畸形 0非畸形 1畸形 - request.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); //标准服务 - request.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId()); //开通 +// request.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); //标准服务 +// request.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId()); //开通 if (patInfo != null && StringUtils.isNotEmpty(fm.getBHNUM())) { diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/llfy/LlfyFmService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/llfy/LlfyFmService.java index 1db081d..3d02b1a 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/llfy/LlfyFmService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/llfy/LlfyFmService.java @@ -644,8 +644,8 @@ public class LlfyFmService { request.setMalformation((fm.getBABY_DEFORMITY() == null ? 0 : 1)); //畸形 0非畸形 1畸形 //request.setMalformation("无".equals(item.getJx()) ? 0 : 1); //畸形 0非畸形 1畸形 - request.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); //标准服务 - request.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId()); //开通 +// request.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); //标准服务 +// request.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId()); //开通 /*if (patInfo != null && StringUtils.isNotEmpty(fm.getBHNUM())) { diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lpfy/LpfyFmService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lpfy/LpfyFmService.java index 33ad771..3c1e5f9 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lpfy/LpfyFmService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lpfy/LpfyFmService.java @@ -267,8 +267,8 @@ public class LpfyFmService implements IlpFyFmService { request.setMalformation((fm.getBABY_DEFORMITY() == null ? 0 : 1)); //畸形 0非畸形 1畸形 //request.setMalformation("无".equals(item.getJx()) ? 0 : 1); //畸形 0非畸形 1畸形 - request.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); //标准服务 - request.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId()); //开通 +// request.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); //标准服务 +// request.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId()); //开通 /*if (patInfo != null && StringUtils.isNotEmpty(fm.getBHNUM())) { 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 c4008ea..1acb504 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 @@ -828,8 +828,8 @@ public class QhdfyFmService { request.setHighRisk("是".equals(item.getSfgw()) ? 1 : 0); ////是否高危 0 非高危 1高危 request.setMalformation("无".equals(item.getJx()) ? 0 : 1); //畸形 0非畸形 1畸形 - request.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); //标准服务 - request.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId()); //开通 +// request.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); //标准服务 +// request.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId()); //开通 if (patInfo != null && StringUtils.isNotEmpty(patInfo.getBlh())) { diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/zcfy/ZcfyFmService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/zcfy/ZcfyFmService.java index 794357d..43d1652 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/zcfy/ZcfyFmService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/zcfy/ZcfyFmService.java @@ -609,8 +609,8 @@ public class ZcfyFmService { request.setMalformation((fm.getBABY_DEFORMITY() == null ? 0 : 1)); //畸形 0非畸形 1畸形 //request.setMalformation("无".equals(item.getJx()) ? 0 : 1); //畸形 0非畸形 1畸形 - request.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); //标准服务 - request.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId()); //开通 +// request.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); //标准服务 +// request.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId()); //开通 /*if (patInfo != null && StringUtils.isNotEmpty(fm.getBHNUM())) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java index e44b526..3dbb70f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java @@ -376,6 +376,7 @@ public class MatDeliverController extends BaseController{ if (queryModel.getBabyWeight() != null && queryModel.getBabyWeight().contains(",")) { String arrs[] = queryModel.getBabyWeight().split(","); + System.out.println("======================"+arrs); for (int i = 0 ; i < arrs.length ; i++) { weight+=(Double.parseDouble(arrs[i]) * 1000)+""; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java index dfe5895..1fc6f26 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java @@ -961,9 +961,9 @@ public class PatientServiceFacade { { //标准服务开通 List> serInfos = new ArrayList<>(); - Map serMap = new HashMap<>(); - serMap.put("serType", String.valueOf(PatientSerEnums.SerTypeEnums.babyBzfw.getId())); - serInfos.add(serMap); +// Map serMap = new HashMap<>(); +// serMap.put("serType", String.valueOf(PatientSerEnums.SerTypeEnums.babyBzfw.getId())); +// serInfos.add(serMap); return serInfos; }