diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/PostpartumFollowMakeEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/PostpartumFollowMakeEnums.java index 42b7439..bc959cf 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/PostpartumFollowMakeEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/PostpartumFollowMakeEnums.java @@ -359,6 +359,59 @@ public class PostpartumFollowMakeEnums { } return list; } + + + + /** + * 用于承德和衡水 + * 访视状态 + */ + public enum StatusEnum1 { + DFS(1, "待访视"), YFS(2, "本机构已访视"), BXQ(3, "本辖区已访视"); + private int id; + private String name; + + StatusEnum1(int id, String name) { + this.id = id; + this.name = name; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public static String getTitle(Integer id) { + for (StatusEnum1 e:values()) { + if (e.getId() == id) { + return e.getName(); + } + } + return ""; + } + } + public static List getStatusEnums1() { + List list = new ArrayList<>(); + for (StatusEnum1 enums : StatusEnum1.values()) { + Map resultMap = new HashMap<>(); + resultMap.put("id", enums.getId()); + resultMap.put("name", enums.getName()); + list.add(resultMap); + } + return list; + } + /** * 访视是否结案 */ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 8359175..72d5376 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -1956,6 +1956,15 @@ public class MatDeliverFacade { matDeliverQuery.setProvincePostRestId(matdeliverFollowRequest.getProvincePostRestId()); matDeliverQuery.setCityPostRestId(matdeliverFollowRequest.getCityPostRestId()); matDeliverQuery.setAreaPostRestId(matdeliverFollowRequest.getAreaPostRestId()); + + if (matdeliverFollowRequest.getVisitStatus() != null && matdeliverFollowRequest.getVisitStatus() == 2) + { + matDeliverQuery.setFsHospitalId(hospitalId); + } + else if(matdeliverFollowRequest.getVisitStatus() != null && matdeliverFollowRequest.getVisitStatus() == 1) + { + matDeliverQuery.setVisitStatus(matdeliverFollowRequest.getVisitStatus()); + } } else { @@ -1966,6 +1975,8 @@ public class MatDeliverFacade { matDeliverQuery.setFsHospitalId(matdeliverFollowRequest.getFsHospitalId()); } } + + matDeliverQuery.setVisitStatus(matdeliverFollowRequest.getVisitStatus()); } matDeliverQuery.setContactResult(matdeliverFollowRequest.getContactResult()); @@ -1976,7 +1987,7 @@ public class MatDeliverFacade { matDeliverQuery.setVisitAffirm(matdeliverFollowRequest.getVisitAffirm()); - matDeliverQuery.setVisitStatus(matdeliverFollowRequest.getVisitStatus()); + matDeliverQuery.setMakeType(matdeliverFollowRequest.getMakeType()); List maternalDeliverModelList; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java index e190135..68d2fcc 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java @@ -97,6 +97,8 @@ public class MatdeliverFollowFacade { map.put("visitResult", PostpartumFollowMakeEnums.getResultEnum()); //访视状态(1-待访视、2-已访视) map.put("visitStatus", PostpartumFollowMakeEnums.getStatusEnum()); + //承德衡水访视状态 + map.put("visitStatus1", PostpartumFollowMakeEnums.getStatusEnum()); //访视类型 map.put("followType", PostpartumFollowMakeEnums.getTypeEnum()); //异常 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java index f13493d..30d9e93 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java @@ -54,7 +54,7 @@ public class SyncDataTaskService { urls.put("area-dz-api.healthbaby.com.cn:12356","德州"); urls.put("area-qhd-api.healthbaby.com.cn:18019","秦皇岛"); // urls.put("area-nc-api.healthbaby.com.cn:12356","南充"); - urls.put("area-laoling-api.healthbaby.com.cn:12356","乐陵"); + //urls.put("area-laoling-api.healthbaby.com.cn:12356","乐陵"); urls.put("area-zhuchengrenmin-api.healthbaby.com.cn:12356","诸城人民医院"); // urls.put("area-hengshui-api.healthbaby.com.cn:8787","衡水区域"); urls.put("area-rongcheng-api.healthbaby.com.cn:12356","荣成");