diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java index e0ce0fe..5d0b591 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java @@ -19,7 +19,8 @@ public class Patients extends BaseModel { private static final long serialVersionUID = SerialIdEnum.Patients.getCid(); /*20201130 null历史||1 不是特殊产筛建档, 2 衡水特殊产筛建档 */ private String screening; - + //是否预约住院分娩医院(秦皇岛定制) 1 否 2是 + private String isYyzyfmHospital; //预约住院分娩医院(滦平定制) private String yyzyfmHospitalId; @@ -406,6 +407,14 @@ public class Patients extends BaseModel { //初诊时间 private Date firstCheckTime; + public String getIsYyzyfmHospital() { + return isYyzyfmHospital; + } + + public void setIsYyzyfmHospital(String isYyzyfmHospital) { + this.isYyzyfmHospital = isYyzyfmHospital; + } + public String getFirstCheckId() { return firstCheckId; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java index 883f2c9..ad6d6a5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java @@ -388,6 +388,38 @@ public class OrganizationController extends BaseController { } + @RequestMapping(value = "/organizationByCityId", method = RequestMethod.GET) + @ResponseBody + @TokenRequired + public Map organizationByCityId(HttpServletRequest request, + @RequestParam(value = "cityId", required = false) String cityId) { + OrganizationQuery organizationQuery = new OrganizationQuery(); + organizationQuery.setCityId(cityId); + + List datas = new ArrayList<>(); + List organizations = organizationService.queryOrganization(organizationQuery); + if (CollectionUtils.isNotEmpty(organizations)) { + for (Organization organization : organizations) { + Map data = new HashMap(); + data.put("id",organization.getId()); + data.put("name",organization.getName()); + datas.add(data); + } + } + + Map mapqt = new HashMap<>(); + mapqt.put("id","-1"); + mapqt.put("name", "其他"); + datas.add(mapqt); + + Map map = new HashMap<>(); + map.put("data", datas); + map.put("errormsg", "成功"); + map.put("errorcode", ErrorCodeConstants.SUCCESS); + return map; + } + + /** * 获取列表 */ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index 81c39db..29f385f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -1808,7 +1808,7 @@ public class ApplyOrderFacade { public boolean hsHuadaSaveSampleInfo(HuadaSieveApplyOrderAddRequest sieveHuada) { try { //设置固定值， - sieveHuada.setInformedConsent("02"); + sieveHuada.setInformedConsent("01"); //是否签署知情同意书（01-同意捐献、02-不同意捐 献、03-未签署知情同意书） sieveHuada.setInformedConsentVersion("02"); sieveHuada.setGestationalWeeks(getWeeks(sieveHuada.getGestationalWeeks()));//孕周 sieveHuada.setChargeType("3"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index 82ba665..760a5e3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -1768,6 +1768,7 @@ public class BookbuildingFacade { */ public Patients getPatientsData(YunBookbuildingAddRequest yunRequest) { Patients patient = new Patients(); + patient.setIsYyzyfmHospital(yunRequest.getIsYyzyfmHospital()); patient.setNormal(yunRequest.getNormal()); patient.setChildExtAddrs(yunRequest.getChildExtAddrs()); //默认为未分娩 @@ -2036,6 +2037,7 @@ public class BookbuildingFacade { public PregnantInfoResult getResult(Patients p) { PregnantInfoResult result = new PregnantInfoResult(); + result.setIsYyzyfmHospital(p.getIsYyzyfmHospital()); result.setChildExtAddrs(p.getChildExtAddrs()); result.setReqHusband(p.getReqHusband()); result.setLastMenstrualPeriodBasisOther(p.getLastMenstrualPeriodBasisOther()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java index bb7f3c1..c47ba8a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java @@ -17,6 +17,10 @@ public class YunBookbuildingAddRequest { /*20201130 null历史||1 不是特殊产筛建档, 2 衡水特殊产筛建档 */ private String screening; + + //是否预约住院分娩医院(秦皇岛定制) 1 否 2是 + private String isYyzyfmHospital; + //预约住院分娩医院(滦平定制) private String yyzyfmHospitalId; @@ -489,6 +493,13 @@ public class YunBookbuildingAddRequest { //丈夫年龄 private Integer hmarriageAge; + public String getIsYyzyfmHospital() { + return isYyzyfmHospital; + } + + public void setIsYyzyfmHospital(String isYyzyfmHospital) { + this.isYyzyfmHospital = isYyzyfmHospital; + } public Integer getHmarriageAge() { return hmarriageAge; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java index 7eda96c..d4a0132 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java @@ -9,6 +9,9 @@ import java.util.Map; * Created by Administrator on 2016/6/15. */ public class PregnantInfoResult { + //是否预约住院分娩医院(秦皇岛定制) 1 否 2是 + private String isYyzyfmHospital; + private Map yyzyfmHospitalId; /*20201130 null历史||1 不是特殊产筛建档, 2 衡水特殊产筛建档 */ private String screening; @@ -45,6 +48,15 @@ public class PregnantInfoResult { //空或者1为正常 2为补录 private String normal; + + public String getIsYyzyfmHospital() { + return isYyzyfmHospital; + } + + public void setIsYyzyfmHospital(String isYyzyfmHospital) { + this.isYyzyfmHospital = isYyzyfmHospital; + } + public String getNormal() { return normal; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java index 4572954..4a1119c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java @@ -103,11 +103,11 @@ public class BabyListTask implements Callable { if (StringUtils.isNotEmpty(model.getLastCheckDoctor())) { try { - String userName = usersService.getUsers(Integer.parseInt(model.getBuildDoctor())).getName(); + String userName = usersService.getUsers(Integer.parseInt(model.getLastCheckDoctor())).getName(); result.setLastCheckDoctor(userName); }catch (Exception e) { - result.setLastCheckDoctor("产科病房"); + result.setLastCheckDoctor(""); } }