From 07d531ace27168dc8261395d08d3f56a08267d1f Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Mon, 19 Dec 2016 10:24:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A7=E6=A3=80=E5=88=A0?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/permission/model/Organization.java | 11 +- .../common/constants/ErrorCodeConstants.java | 2 + .../main/java/com/lyms/platform/pojo/Patients.java | 10 ++ .../web/facade/AntenatalExaminationFacade.java | 126 ++++++++++++++------- .../operate/web/facade/AutoMatchFacade.java | 12 ++ .../operate/web/facade/BookbuildingFacade.java | 10 +- .../operate/web/facade/MatDeliverFacade.java | 70 ++++-------- .../platform/operate/web/facade/PatientFacade.java | 7 +- .../operate/web/facade/PostReviewFacade.java | 25 +++- .../operate/web/request/AntExAddRequest.java | 9 ++ .../operate/web/request/AntExcAddRequest.java | 10 ++ .../operate/web/request/MatDeliverAddRequest.java | 10 ++ .../operate/web/request/PostReviewRequest.java | 9 ++ .../lyms/platform/operate/web/result/AntData.java | 3 +- .../operate/web/result/AntexListResult.java | 22 ++-- .../src/main/resources/database.properties | 2 + 16 files changed, 232 insertions(+), 106 deletions(-) diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Organization.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Organization.java index 6e5efc5..a1dceec 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Organization.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Organization.java @@ -26,7 +26,8 @@ public class Organization { private Date modified; private Date created; private String shortCode; - + //是否是建档医院 1 建档医院 数据库默认建档医院 2 非建档医院 + private Integer bStatus; private IdTextModel levelObj; private IdTextModel typeObj; private Object province; @@ -37,6 +38,14 @@ public class Organization { private Integer orgType; //-1 未设置 0 公司 1 医院 private Integer status; + public Integer getbStatus() { + return bStatus; + } + + public void setbStatus(Integer bStatus) { + this.bStatus = bStatus; + } + public Integer getStatus() { return status; } diff --git a/platform-common/src/main/java/com/lyms/platform/common/constants/ErrorCodeConstants.java b/platform-common/src/main/java/com/lyms/platform/common/constants/ErrorCodeConstants.java index 017752a..8ed52b5 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/constants/ErrorCodeConstants.java +++ b/platform-common/src/main/java/com/lyms/platform/common/constants/ErrorCodeConstants.java @@ -57,4 +57,6 @@ public class ErrorCodeConstants { //没有权限 public static final int NO_POWER = 4021; + //区域模式运行 + public static final String RUN_MODE="1"; } 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 e734f3e..aeb5649 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 @@ -170,6 +170,8 @@ public class Patients extends BaseModel { private String publishId; private String publishName; + //数据来源id,用于区域隐藏建档 + private String source; private Integer yn; @@ -234,6 +236,14 @@ public class Patients extends BaseModel { //操作人 private Integer operator; + public String getSource() { + return source; + } + + public void setSource(String source) { + this.source = source; + } + public String getoRiskFactor() { return oRiskFactor; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 19146a0..36de3b1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -57,10 +57,47 @@ public class AntenatalExaminationFacade { private UsersService usersService; @Autowired private DeleteProcessHandler deleteProcessHandler; -@Autowired + @Autowired private AntExRecordService recordService; - private BaseResponse riskEnums; + private String runType; + /** + * 处理区域隐藏建档 + * + * @param pid 系统中 + * @param parentId + * @param userId + * @return + */ + public String handHideBuild(String pid, String parentId, Integer userId) { + String hospitalId = autoMatchFacade.getHospitalId(userId); + //修改时不为空 + if (StringUtils.isNotEmpty(parentId)) { + return parentId; + } + + Patients patients = findOnePatient(null, null, null, hospitalId, 1, false, pid, true); + //表示本院已经有隐藏建档 + if (null != patients) { + return patients.getId(); + } + + //表示区域的 + if (ErrorCodeConstants.RUN_MODE.equals(runType) && StringUtils.isEmpty(parentId) && StringUtils.isNotEmpty(pid)) { + patients = findOnePatient(null, null, null, null, 1, false, pid, false); + patients.setSource(patients.getId()); + patients.setId(null); + patients.setHospitalId(hospitalId); + patients.setType(1); + patients.setCreated(new Date()); + patients.setBookbuildingDoctor(userId + ""); + patients.setEnable("0"); + patients.setBookbuildingDate(new Date()); + patientsService.addPatient(patients); + return patients.getId(); + } + return null; + } /** * 修改最后一次产检时间 * @@ -68,33 +105,8 @@ public class AntenatalExaminationFacade { * @param id * @param type 1 初诊 2 复诊 */ - private void setLashCTimes(String hospitalId, String id, int type) { + private void setLashCTimes(String id) { - /* Patients patients = patientsService.findOnePatientById(id); - List list = new ArrayList<>(); - if (type == 2) { - AntExQuery antExQuery = new AntExQuery(); - antExQuery.setYn(YnEnums.YES.getId()); - antExQuery.setHospitalId(hospitalId); - antExQuery.setParentId(id); - List antExList = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery()); - if (CollectionUtils.isNotEmpty(antExList)) { - for (AntenatalExaminationModel antEx : antExList) { - list.add(antEx.getCheckDate()); - } - } - } else if (type == 1) { - AntExChuQuery antExChuQuery = new AntExChuQuery(); - antExChuQuery.setYn(YnEnums.YES.getId()); - antExChuQuery.setHospitalId(hospitalId); - antExChuQuery.setParentId(id); - List antExChu = antenatalExaminationService.queryAntExChu(antExChuQuery.convertToQuery()); - if (CollectionUtils.isNotEmpty(antExChu)) { - for (AntExChuModel antEx : antExChu) { - list.add(antEx.getCheckTime()); - } - } - }*/ AntExQuery antExQuery = new AntExQuery(); antExQuery.setParentId(id); antExQuery.setYn(YnEnums.YES.getId()); @@ -147,7 +159,7 @@ public class AntenatalExaminationFacade { //修改本院最后一次定义高危 updateLastRhTime(patients.getId(), hospitalId); //修改最后一次检查时间 - setLashCTimes(hospitalId, antExAddRequest.getParentId(), 2); + setLashCTimes(antExAddRequest.getParentId()); //复诊,修改产检管理 antenatalExaminationService.updateAntExRecord(antExAddRequest.getId(), 2); @@ -176,7 +188,7 @@ public class AntenatalExaminationFacade { antenatalExaminationService.addOneBabyAnt(model); //修改最后一次检查时间 - setLashCTimes(hospitalId, antExAddRequest.getParentId(), 2); + setLashCTimes(antExAddRequest.getParentId()); //修改申请单状态 updateApplyOrder(model, antExAddRequest.getParentId()); //修改孕妇高危等级 @@ -250,6 +262,15 @@ public class AntenatalExaminationFacade { public BaseResponse addOneAnetExChu(AntExcAddRequest excAddRequest, Integer userId) { AntExChuModel antExChuModel = excAddRequest.convertToDataModel(); String hospitalId = autoMatchFacade.getHospitalId(userId); + + //表示区域的 + if (ErrorCodeConstants.RUN_MODE.equals(runType)) { + String parentId = handHideBuild(excAddRequest.getPid(), excAddRequest.getParentId(), userId); + if (StringUtils.isEmpty(parentId)) { + //打印日志 + } + antExChuModel.setParentId(parentId); + } antExChuModel.setOperator(userId); if (StringUtils.isNotEmpty(antExChuModel.getId()) && StringUtils.isNotEmpty(antExChuModel.getParentId())) { antExChuModel.setHospitalId(hospitalId); @@ -273,7 +294,7 @@ public class AntenatalExaminationFacade { //修改本院最后一次定义高危 updateLastRhTime(patients.getId(), hospitalId); - setLashCTimes(hospitalId, antExChuModel.getParentId(), 1); + setLashCTimes(antExChuModel.getParentId()); //初诊,修改产检管理 // antenatalExaminationService.updateAntExRecord(antExChuModel.getId(), 1); @@ -319,7 +340,7 @@ public class AntenatalExaminationFacade { //修改本院最后一次定义高危 updateLastRhTime(patients.getId(), hospitalId); - setLashCTimes(hospitalId, antExChuModel.getParentId(), 1); + setLashCTimes(antExChuModel.getParentId()); if(StringUtils.isNotEmpty(antExChuModel.getPid())){ recordService.handExRecord(antExChuModel.getPid()); } @@ -788,7 +809,7 @@ public class AntenatalExaminationFacade { List listDate = new ArrayList(); if (CollectionUtils.isNotEmpty(list)) { - Patients patients2 = findOnePatient(null, null, null, hospital, -1, true, exListQueryRequest.getPid()); + Patients patients2 = findOnePatient(null, null, null, hospital, -1, true, exListQueryRequest.getPid(),false); antexListResult.convertToResult(null, patients2, null); HighScoreResult highScoreResult = findLastRisk(list.get(0).getPid(), false); @@ -1447,7 +1468,7 @@ public class AntenatalExaminationFacade { //修改最后一次检查时间 AntenatalExaminationModel antenatalExaminationModel = antenatalExaminationService.findOneById(antExQueryRequest.getId()); - setLashCTimes(hospital, antenatalExaminationModel.getParentId(), 2); + setLashCTimes( antenatalExaminationModel.getParentId()); updateLastRisk(antenatalExaminationModel.getParentId()); recordService.handExRecord(antenatalExaminationModel.getParentId()); @@ -1496,7 +1517,7 @@ public class AntenatalExaminationFacade { antenatalExaminationService.updateAntExChu(antExChuModel, antExQueryRequest.getId()); AntExChuModel antExChuModel1 = antenatalExaminationService.findOne(antExQueryRequest.getId()); - setLashCTimes(hospital, antExChuModel1.getParentId(), 1); + setLashCTimes(antExChuModel1.getParentId()); updateLastRisk(antExChuModel1.getParentId()); recordService.handExRecord(antExChuModel1.getParentId()); } else { @@ -1583,7 +1604,7 @@ public class AntenatalExaminationFacade { * @param type 类型 1 孕妇 3 产妇 -1 不区分 * @param outHospital 是否需要查外院 */ - public Patients findOnePatient(String cardNo, String vcCardNo, String id, String hospitalId, Integer type, boolean outHospital, String pid) { + public Patients findOnePatient(String cardNo, String vcCardNo, String id, String hospitalId, Integer type, boolean outHospital, String pid, boolean isEnable) { PatientsQuery patientsQuery = new PatientsQuery(); if (StringUtils.isNotEmpty(cardNo)) { patientsQuery.setCardNo(cardNo); @@ -1598,6 +1619,9 @@ public class AntenatalExaminationFacade { patientsQuery.setHospitalId(hospitalId); patientsQuery.setYn(YnEnums.YES.getId()); patientsQuery.setBuildType(1); + if (isEnable) { + patientsQuery.setEnable("0"); + } Patients patients = null; List list = patientsService.queryPatient1(patientsQuery, "modified"); if (CollectionUtils.isNotEmpty(list)) { @@ -1661,19 +1685,33 @@ public class AntenatalExaminationFacade { } } else { - //查询产妇数据 - patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, hospitalId, 1, false, null); + //区域模式 + if (ErrorCodeConstants.RUN_MODE.equals(runType)) { + patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, hospitalId, 1, false, null, true); + } else { + //查询产妇数据 + patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, hospitalId, 1, false, null, false); + } } if (null == patients) { - //查询是否还有其他记录 - patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, hospitalId, 3, false, null); - - if (null != patients) { - return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("该孕妇在系统中已分娩/已终止妊娠不能再进行产检,请重新建档"); + if (ErrorCodeConstants.RUN_MODE.equals(runType)) { + //查询是否还有其他记录 + patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, hospitalId, 3, false, null, true); + } else { + //查询是否还有其他记录 + patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, hospitalId, 3, false, null, false); } - return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("该孕妇还未在本院建档不能进行产检"); + + //区域模式 + if (ErrorCodeConstants.RUN_MODE.equals(runType)) { + //原来单机 + if (null != patients) { + return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("该孕妇在系统中已分娩/已终止妊娠不能再进行产检,请重新建档"); + } + return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("该孕妇还未在本院建档不能进行产检"); + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AutoMatchFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AutoMatchFacade.java index ddab632..764f709 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AutoMatchFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AutoMatchFacade.java @@ -13,6 +13,7 @@ import com.lyms.platform.pojo.CommunityConfig; import com.lyms.platform.pojo.Patients; import com.lyms.platform.query.PatientsQuery; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -112,4 +113,15 @@ public class AutoMatchFacade { } return list.get(0)+""; } + public boolean checkBStatus(Integer userId){ + String hospital=getHospitalId(userId); + if(StringUtils.isEmpty(hospital)){ + return true; + } + Organization org= organizationService.getOrganization(Integer.valueOf(hospital)); + if(null!=org){ + return org.getbStatus()==1; + } + return false; + } } 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 fd192fb..2dd73ad 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 @@ -11,6 +11,7 @@ import com.lyms.platform.common.enums.*; import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.*; +import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.request.*; import com.lyms.platform.operate.web.result.*; import com.lyms.platform.operate.web.utils.JdbcUtil; @@ -23,6 +24,7 @@ import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.*; import com.lyms.platform.query.*; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -103,6 +105,8 @@ public class BookbuildingFacade { @Autowired private SieveService sieveService; + private String runType; + /** * 添加孕妇建档 * @param yunRequest @@ -543,7 +547,11 @@ public class BookbuildingFacade { { String hospitalId = autoMatchFacade.getHospitalId(userId); patientsQuery.setVcCardNo(bookbuildingQueryRequest.getVcCardNo()); - patientsQuery.setHospitalId(hospitalId); + //区域模式 + if (!ErrorCodeConstants.RUN_MODE.equals(runType)) { + patientsQuery.setHospitalId(hospitalId); + } + List patientsVc = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); if (CollectionUtils.isNotEmpty(patientsVc)) { 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 20c55cc..743a4a2 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 @@ -69,6 +69,9 @@ public class MatDeliverFacade { private BabyBookbuildingFacade babyBookbuildingFacade; @Autowired private DeleteProcessHandler deleteProcessHandler; + + private String runType; + private static Map ONE_ENUMS = new HashMap<>(); private static Map babyMap = new HashMap<>(); @@ -120,6 +123,15 @@ public class MatDeliverFacade { public BaseResponse addOrUpdateMatDeliver(MatDeliverAddRequest deliverAddRequest, Integer userId) { List babyList = new ArrayList<>(); String hospitalId = autoMatchFacade.getHospitalId(userId); + MaternalDeliverModel maternalDeliverModel = deliverAddRequest.convertToDataModel(); + //区域模式 + if (ErrorCodeConstants.RUN_MODE.equals(runType)) { + String parentId =antenatalExaminationFacade.handHideBuild(deliverAddRequest.getPid(), deliverAddRequest.getParentId(), userId); + if (StringUtils.isEmpty(parentId)) { + } + maternalDeliverModel.setParentId(parentId); + } + //增加 if (StringUtils.isEmpty(deliverAddRequest.getId()) && StringUtils.isNotEmpty(deliverAddRequest.getParentId())) { MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); @@ -144,7 +156,7 @@ public class MatDeliverFacade { if (CollectionUtils.isNotEmpty(list2) || CollectionUtils.isNotEmpty(models)) { return new BaseResponse().setErrorcode(ErrorCodeConstants.DATA_EXIST).setErrormsg("同一天只能建一次分娩/终止妊娠"); } - MaternalDeliverModel maternalDeliverModel = deliverAddRequest.convertToDataModel(); + //获取到小孩信息 maternalDeliverModel.setOperator(userId); List list = deliverAddRequest.getBabies(); @@ -214,7 +226,7 @@ public class MatDeliverFacade { matDeliverService.addMatDeliver(maternalDeliverModel); //修改 } else if (StringUtils.isNotEmpty(deliverAddRequest.getId()) && StringUtils.isNotEmpty(deliverAddRequest.getParentId())) { - MaternalDeliverModel maternalDeliverModel = deliverAddRequest.convertToDataModel(); + MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); maternalDeliverModel.setOperator(userId); Patients patients2 = patientsService.findOnePatientById(deliverAddRequest.getParentId()); @@ -266,18 +278,6 @@ public class MatDeliverFacade { //修改分娩日期 updatePatientFmDate(patients.getPid(), fmDate, 3); - /* if (CollectionUtils.isNotEmpty(patients)) { - if(fmDate.after(DateUtil.addDay(patients.get(0).getLastMenses(),168))){ - Patients patients2=new Patients(); - patients2.setFmDate(fmDate); - patients2.setType(3); - PatientsQuery patientsQuery1=new PatientsQuery(); - patientsQuery1.setPid(patients.get(0).getPid()); - patientsQuery1.setYn(YnEnums.YES.getId()); - patientsQuery1.setLastMensesStart(); - patientsService.findAndModify(patientsQuery1, patients2); - } - }*/ } } else { return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("parentId 为空,找不到产妇"); @@ -385,36 +385,6 @@ public class MatDeliverFacade { } } - public static void main(String[] args) { - MatDeliverAddRequest.Baby baby = new MatDeliverAddRequest.Baby(); - baby.setBabyGender("1"); - - MatDeliverAddRequest.Baby baby1 = new MatDeliverAddRequest.Baby(); - baby1.setBabyGender("1"); - MatDeliverAddRequest.Baby baby2 = new MatDeliverAddRequest.Baby(); - baby2.setBabyGender("0"); - MatDeliverAddRequest.Baby baby3 = new MatDeliverAddRequest.Baby(); - baby3.setBabyGender("1"); - MatDeliverAddRequest.Baby baby4 = new MatDeliverAddRequest.Baby(); - baby4.setBabyGender("0"); - List list = new ArrayList(); - list.add(baby); - list.add(baby1); - /*list.add(baby2); - list.add(baby3); - list.add(baby4); */ - System.out.print(buildBabyName(list)); - ; - - - Date fmDate = DateUtil.parseYMD("2016-8-18"); - - - Date date = DateUtil.addDay(DateUtil.parseYMD("2015-8-11"), 168); - System.out.print(DateUtil.getyyyy_MM_dd(date)); - System.out.print(fmDate.after(date)); - - } /** * 处理儿童 @@ -530,16 +500,22 @@ public class MatDeliverFacade { if (null == patients) { return new BaseResponse().setErrormsg("没有相关的产妇记录").setErrorcode(ErrorCodeConstants.BUSINESS_ERROR); }*/ + //区域模式 + boolean isEnable=false; + if (ErrorCodeConstants.RUN_MODE.equals(runType)) { + isEnable=true; + } + //外院的孕妇 - Patients patients1 = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, null, 1, false, null); + Patients patients1 = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, null, 1, false, null,true); //外院的产妇 // Patients patients2 = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, null, 3); //http://jira.healthbaby.com.cn/browse/WEB-204 修改bug //本院的孕妇 - Patients patients = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, hospital, 1, false, null); + Patients patients = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, hospital, 1, false, null,isEnable); //本院产妇 - Patients patients3 = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, hospital, 3, false, null); + Patients patients3 = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, hospital, 3, false, null,isEnable); PersonModelQuery personModelQuery = new PersonModelQuery(); String pid = ""; if (null != patients1) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index a59a8d9..769c3a0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -380,6 +380,11 @@ public class PatientFacade { } else { String hospital = autoMatchFacade.getHospitalId(userId); patientsQuery.setHospitalId(hospital); + + boolean result = autoMatchFacade.checkBStatus(userId); + if(!result){ + patientsQuery.setEnable("0"); + } } patientsQuery.setNeed(needPage); @@ -453,7 +458,7 @@ public class PatientFacade { patientsQuery.setPhone(patientQueryRequest.getPhone()); patientsQuery.setCardNo(patientQueryRequest.getCardNo()); String hospital = autoMatchFacade.getHospitalId(userId); - Patients patients = antenatalExaminationFacade.findOnePatient(patientQueryRequest.getCardNo(), null, patientQueryRequest.getId(), hospital, -1, false, patientQueryRequest.getPid()); + Patients patients = antenatalExaminationFacade.findOnePatient(patientQueryRequest.getCardNo(), null, patientQueryRequest.getId(), hospital, -1, false, patientQueryRequest.getPid(),false); PatientBaseResult patientBaseResult = new PatientBaseResult(); if (null != patients) { patientBaseResult.convert(patients); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java index 6e49efb..2015437 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java @@ -62,6 +62,8 @@ public class PostReviewFacade { @Autowired private ApplyOrderService applyOrderService; + private String runType; + /** * * 增加产后复查记录 @@ -75,10 +77,21 @@ public class PostReviewFacade { * @return */ public BaseResponse addPostReview(PostReviewRequest postReviewRequest,Integer userId) { + PostReviewModel postReviewModel = postReviewRequest.convertToDataModel(); + + //表示区域的 + if (ErrorCodeConstants.RUN_MODE.equals(runType)) { + String parentId = examinationFacade.handHideBuild(postReviewRequest.getPid(), postReviewRequest.getParentId(), userId); + if (StringUtils.isEmpty(parentId)) { + //打印日志 + } + postReviewModel.setParentId(parentId); + } + //获取数据 Patients patients1 = patientsService.findOnePatientById(postReviewRequest.getParentId()); String hospital= autoMatchFacade.getHospitalId(userId); - PostReviewModel postReviewModel = postReviewRequest.convertToDataModel(); + postReviewModel.setOperator(userId); //判断是否是同一个医院 if(!patients1.getHospitalId().equals(hospital)){ @@ -180,9 +193,15 @@ public class PostReviewFacade { * @return */ public BaseResponse queryPostList(PostReviewQueryRequest postReviewQueryRequest,Integer userId) { + Patients patients=null; + if(ErrorCodeConstants.RUN_MODE.equals(runType)){ + patients = examinationFacade.findOnePatient(postReviewQueryRequest.getCardNo(), postReviewQueryRequest.getVcCardNo(), null, null, 1,false,null,true); + }else { + patients = examinationFacade.findOnePatient(postReviewQueryRequest.getCardNo(), postReviewQueryRequest.getVcCardNo(), null, null, 1,false,null,false); + } //未分娩建档 - Patients patients = examinationFacade.findOnePatient(postReviewQueryRequest.getCardNo(), postReviewQueryRequest.getVcCardNo(), null, null, 1,false,null); + if(null!=patients){ return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("该孕妇还未分娩,不能进行复查"); } @@ -191,7 +210,7 @@ public class PostReviewFacade { String hospitalId = autoMatchFacade.getHospitalId(userId); //取所有医院的建档数据 优先取本院 ,然后取外院 - Patients patientsList = examinationFacade.findOnePatient(postReviewQueryRequest.getCardNo(), postReviewQueryRequest.getVcCardNo(), null, hospitalId, 3,true,null); + Patients patientsList = examinationFacade.findOnePatient(postReviewQueryRequest.getCardNo(), postReviewQueryRequest.getVcCardNo(), null, hospitalId, 3,true,null,true); PostReviewListResult postReviewListResult = new PostReviewListResult(); if (null != patientsList) { if(null!=patientsList.getDueStatus() && 1 == patientsList.getDueStatus()){ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java index 2781091..2faa553 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java @@ -18,6 +18,8 @@ import java.util.Map; public class AntExAddRequest implements IBasicRequestConvert { // 访视记录id private String id; + + private String pid; //产妇id private String parentId; //当前孕周 @@ -75,6 +77,13 @@ public class AntExAddRequest implements IBasicRequestConvert { @NotEmpty(message = "孕妇id不能为空") private String parentId; private String id; + + private String pid; //预产期 private String dueDate; //末次月经 @@ -860,6 +862,14 @@ public class AntExcAddRequest implements IBasicRequestConvert { this.ywgmHistory = ywgmHistory; } + public String getPid() { + return pid; + } + + public void setPid(String pid) { + this.pid = pid; + } + @Override public AntExChuModel convertToDataModel() { AntExChuModel antExChuModel=new AntExChuModel(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java index fb658fb..d4f8638 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java @@ -21,6 +21,8 @@ import java.util.Map; @Form public class MatDeliverAddRequest implements IBasicRequestConvert{ private String id; + // + private String pid; //产妇id private String parentId; //分娩时间 @@ -83,6 +85,14 @@ public class MatDeliverAddRequest implements IBasicRequestConvert { private String id; + private String pid; //产妇id @FormParam @NotEmpty(message = "产妇id不能为空") @@ -96,6 +97,14 @@ public class PostReviewRequest implements IBasicRequestConvert + *

* Created by Administrator on 2016/6/16 0016. */ public class AntexListResult { private String id; + + private String pid; //名字 private String name; //年龄 @@ -51,6 +53,14 @@ public class AntexListResult { // + public String getPid() { + return pid; + } + + public void setPid(String pid) { + this.pid = pid; + } + public String getTireNumber1() { return tireNumber1; } @@ -191,16 +201,16 @@ public class AntexListResult { } public AntexListResult convertToResult(List destModel, Patients patients, List antExChuModel) { - if(null!=patients){ + if (null != patients) { setId(patients.getId()); try { if (null != patients.getBirth()) { setAge(DateUtil.getAge(patients.getBirth())); setBirth(DateUtil.getyyyy_MM_dd(patients.getBirth())); } - } catch (Exception e) { } + setPid(patients.getPid()); if (null != patients.getDueDate()) { setyChanQi(DateUtil.getyyyy_MM_dd(patients.getDueDate())); } @@ -209,9 +219,8 @@ public class AntexListResult { setPhone(patients.getPhone()); setRemarks(patients.getMremark()); setCardNo(patients.getCardNo()); - setVcCardNo(patients.getVcCardNo()); - if (null!=patients.getDueStatus() && 1 == patients.getDueStatus()) { + if (null != patients.getDueStatus() && 1 == patients.getDueStatus()) { this.dueWeek = "终止妊娠"; } else if (3 == patients.getType()) { this.dueWeek = "已分娩"; @@ -221,13 +230,10 @@ public class AntexListResult { this.dueWeek = StringUtils.dueWeek(days); } } - if (null != patients.getLastMenses()) { setLastMenses(DateUtil.getyyyy_MM_dd(patients.getLastMenses())); } } - - return this; } diff --git a/platform-operate-api/src/main/resources/database.properties b/platform-operate-api/src/main/resources/database.properties index e026f6b..8641791 100644 --- a/platform-operate-api/src/main/resources/database.properties +++ b/platform-operate-api/src/main/resources/database.properties @@ -49,6 +49,8 @@ login.token=265a841b-9bb5-434a-8c2b-e78df86fc45d login.defaultPwd=123456 #1 本地缓存 2 sso登录(需要外网) run.mode=2 +#1 区域 2 单机 +run.region=1 mongo.config.replica.set.address=192.168.1.XXX:27017,192.168.1.113.XXX:27018,192.168.1.xxx:27019 -- 1.8.3.1