From fec0c17dbffffaf8b62ef03fd95841cc9579858e Mon Sep 17 00:00:00 2001 From: yangfei Date: Sat, 10 Mar 2018 17:33:42 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90=E8=BF=BD?= =?UTF-8?q?=E8=AE=BF=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/service/impl/TrackDownServiceImpl.java | 97 +++++++++------------- .../src/main/webapp/WEB-INF/web.xml | 70 ++++++++-------- 2 files changed, 72 insertions(+), 95 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java index 75f4110..de9ee50 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java @@ -144,35 +144,8 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS temp.put("bookbuild", 1); // 孕期建档 1=勾勾 2=叉叉 temp.put("bookbuildDate", DateUtil.getyyyy_MM_dd(patients.getBookbuildingDate())); - if (patients.getDueStatus() == 1 || (patients.getIsAutoFm() != null && patients.getIsAutoFm() == 1)) {//终止妊娠,或自动分娩 - temp.put("fm", 2); // 分娩 1=勾勾 2=叉叉 - } else if (patients.getType() == 3) { //本院已分娩 - if (patients.getIsAutoFm() != null && patients.getIsAutoFm() == 1) { - /** 生产方式 */ - temp.put("fmType", "自动分娩"); - temp.put("fm", 2); // 分娩 1=勾勾 2=叉叉 - } else { - MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); - matDeliverQuery.setParentId(patients.getId()); - matDeliverQuery.setYn(YnEnums.YES.getId()); - matDeliverQuery.setHospitalId(patients.getHospitalId()); - //查询分娩记录 - List list2 = matDeliverService.query(matDeliverQuery); - if (org.apache.commons.collections.CollectionUtils.isNotEmpty(list2)) { - temp.put("fm", 1); // 分娩 1=勾勾 2=叉叉 - MaternalDeliverModel maternalDeliverModel = list2.get(0); - if (StringUtils.isNotEmpty(maternalDeliverModel.getDeliveryMode())) { - Map deliveryModeMap = JsonUtil.getMap(maternalDeliverModel.getDeliveryMode()); - if(deliveryModeMap.containsKey("fmfs")){ - /** 生产方式 */ - temp.put("fmType", FmTypeEnums.getFmNameById(deliveryModeMap.get("fmfs"))); - } - } - } else { - temp.put("fm", 2); // 分娩 1=勾勾 2=叉叉 - } - } - } + //完善分娩方式 + patientFmType(temp,patients); //孕检次数 temp.put("yjcount", getChuzhenCount(patients.getId())); @@ -287,37 +260,8 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS //建档时间 temp.put("bookbuildDate", DateUtil.getyyyy_MM_dd(patient.getBookbuildingDate())); temp.put("bookbuild", 1); // 孕期建档 1=勾勾 2=叉叉 - - //终止妊娠,或自动分娩 - if ((patient.getDueStatus() != null && patient.getDueStatus() == 1) || (patient.getIsAutoFm() != null && patient.getIsAutoFm() == 1)) { - temp.put("fm", 2); // 分娩 1=勾勾 2=叉叉 - } else if (patient.getType() == 3) { //本院已分娩 - if (patient.getIsAutoFm() != null && patient.getIsAutoFm() == 1) { - /** 生产方式 */ - temp.put("fmType", "自动分娩"); - temp.put("fm", 2); // 分娩 1=勾勾 2=叉叉 - } else { - MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); - matDeliverQuery.setParentId(patient.getId()); - matDeliverQuery.setYn(YnEnums.YES.getId()); - matDeliverQuery.setHospitalId(patient.getHospitalId()); - //查询分娩记录 - List list2 = matDeliverService.query(matDeliverQuery); - if (org.apache.commons.collections.CollectionUtils.isNotEmpty(list2)) { - temp.put("fm", 1); // 分娩 1=勾勾 2=叉叉 - MaternalDeliverModel maternalDeliverModel = list2.get(0); - if (StringUtils.isNotEmpty(maternalDeliverModel.getDeliveryMode())) { - Map deliveryModeMap = JsonUtil.getMap(maternalDeliverModel.getDeliveryMode()); - if(deliveryModeMap.containsKey("fmfs")){ - /** 生产方式 */ - temp.put("fmType", FmTypeEnums.getFmNameById(deliveryModeMap.get("fmfs"))); - } - } - } else { - temp.put("fm", 2); // 分娩 1=勾勾 2=叉叉 - } - } - } + //完善分娩方式 + patientFmType(temp,patient); //孕检次数 temp.put("yjcount", getChuzhenCount(patient.getId())); @@ -374,6 +318,39 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS return restList; } + public void patientFmType(Map temp,Patients patient){ + //终止妊娠,或自动分娩 + if ((patient.getDueStatus() != null && patient.getDueStatus() == 1) || (patient.getIsAutoFm() != null && patient.getIsAutoFm() == 1)) { + temp.put("fm", 2); // 分娩 1=勾勾 2=叉叉 + } else if (patient.getType() == 3) { //本院已分娩 + if (patient.getIsAutoFm() != null && patient.getIsAutoFm() == 1) { + /** 生产方式 */ + temp.put("fmType", "自动分娩"); + temp.put("fm", 2); // 分娩 1=勾勾 2=叉叉 + } else { + MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); + matDeliverQuery.setParentId(patient.getId()); + matDeliverQuery.setYn(YnEnums.YES.getId()); + matDeliverQuery.setHospitalId(patient.getHospitalId()); + //查询分娩记录 + List list2 = matDeliverService.query(matDeliverQuery); + if (org.apache.commons.collections.CollectionUtils.isNotEmpty(list2)) { + temp.put("fm", 1); // 分娩 1=勾勾 2=叉叉 + MaternalDeliverModel maternalDeliverModel = list2.get(0); + if (StringUtils.isNotEmpty(maternalDeliverModel.getDeliveryMode())) { + Map deliveryModeMap = JsonUtil.getMap(maternalDeliverModel.getDeliveryMode()); + if(deliveryModeMap.containsKey("fmfs")){ + /** 生产方式 */ + temp.put("fmType", FmTypeEnums.getFmNameById(deliveryModeMap.get("fmfs"))); + } + } + } else { + temp.put("fm", 2); // 分娩 1=勾勾 2=叉叉 + } + } + } + } + /** * 数据未空流程处理 * diff --git a/platform-operate-api/src/main/webapp/WEB-INF/web.xml b/platform-operate-api/src/main/webapp/WEB-INF/web.xml index f28e06f..1ec34a6 100644 --- a/platform-operate-api/src/main/webapp/WEB-INF/web.xml +++ b/platform-operate-api/src/main/webapp/WEB-INF/web.xml @@ -13,41 +13,41 @@ version="2.5" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - - + + + CorsFilter + org.apache.catalina.filters.CorsFilter + + cors.allowed.origins + * + + + cors.allowed.methods + GET,POST,HEAD,OPTIONS,PUT,DELETE + + + cors.allowed.headers + Content-Type,X-Requested-With,accept,Origin,Access-Control-Request-Method,Access-Control-Request-Headers,authorization + + + cors.exposed.headers + Access-Control-Allow-Origin,Access-Control-Allow-Credentials + + + cors.support.credentials + true + + + cors.preflight.maxage + 10 + + + + CorsFilter + /* + + + default -- 1.8.3.1