From e6da7accecf840c202cf904d4ad8d4e73c9c45ff Mon Sep 17 00:00:00 2001 From: yangfei Date: Sat, 10 Mar 2018 13:02:52 +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 --- .../operate/web/facade/MatDeliverFacade.java | 72 ++++++++++------------ .../web/service/impl/TrackDownServiceImpl.java | 12 ++-- 2 files changed, 40 insertions(+), 44 deletions(-) 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 981c9e3..a2a670e 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 @@ -281,12 +281,6 @@ public class MatDeliverFacade { //新增分娩信息 matDeliverService.addMatDeliver(maternalDeliverModel); - - //添加产后追访信息 - if (CollectionUtils.isNotEmpty(patients)) { - addTrackDownInfo(userId,patients.get(0)); - } - operateLogFacade.addAddOptLog(userId, Integer.parseInt(hospitalId), maternalDeliverModel, OptActionEnums.ADD.getId(), "添加分娩"); /** 使用优惠券 */ @@ -299,6 +293,10 @@ public class MatDeliverFacade { //作废产检劵 patientCheckTicketService.cancelCheckTicket(hospitalId, deliverAddRequest.getParentId()); + + //添加产后追访信息 + addTrackDownInfo(userId, patients2); + //修改 } else if (StringUtils.isNotEmpty(deliverAddRequest.getId()) && StringUtils.isNotEmpty(deliverAddRequest.getParentId())) { @@ -341,8 +339,7 @@ public class MatDeliverFacade { List results = matDeliverService.query(query); matDeliverService.updateOne(maternalDeliverModel, maternalDeliverModel.getId()); - if (CollectionUtils.isNotEmpty(results)) - { + if (CollectionUtils.isNotEmpty(results)) { operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), maternalDeliverModel, results.get(0), OptActionEnums.UPDATE.getId(), "修改分娩"); } @@ -384,6 +381,9 @@ public class MatDeliverFacade { /** 填写分娩表分娩 >> 作废未使用的产检券 */ // remoteService.invalidCoupon(patients.getPid(), "2", RemoteUrlEnum.INVALID_COUPON_URL); } + + //添加产后追访信息 + addTrackDownInfo(userId, patients2); } else { return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("parentId 为空,找不到产妇"); } @@ -393,6 +393,7 @@ public class MatDeliverFacade { /** * 分娩添加或更新追访信息 + * * @param userId */ public void addTrackDownInfo(Integer userId, Patients patients) { @@ -401,14 +402,14 @@ public class MatDeliverFacade { if (day <= 60) {//产后60天内，可做产后访视或产后复查环节 if (null != patients) { TrackDownRecord trackDownRecord = patients.build(); - if(patients.getDueStatus() == 1){//终止妊娠 + if (patients.getDueStatus() == 1) {//终止妊娠 trackDownRecord.setTrackType(TrackDownDateEnums.F.getId()); //当前孕妇是孕28周后，进入产后复查追访，否则结束流程 int dueWeek = DateUtil.getWeek2(patients.getLastMenses(), patients.getFmDate()); - if(dueWeek>=28){//进入产后复查 + if (dueWeek >= 28) {//进入产后复查 trackDownRecord.setTrackType(TrackDownDateEnums.J.getId()); - }else{//结束流程 + } else {//结束流程 trackDownRecord.setStatus(0); } } @@ -704,12 +705,12 @@ public class MatDeliverFacade { baby1.setId(babyModel.getId()); //儿童分娩自动建档开通增值服务 - if (babyModel.getServiceType()!=null) { + if (babyModel.getServiceType() != null) { PatientService patientService = new PatientService(); patientService.setPerType(2); List> serInfos = new ArrayList<>(); Map serMap = new HashMap<>(); - serMap.put("serType",String.valueOf(PatientSerEnums.SerTypeEnums.babyBzfw.getId())); + serMap.put("serType", String.valueOf(PatientSerEnums.SerTypeEnums.babyBzfw.getId())); serInfos.add(serMap); patientService.setSerInfos(serInfos); patientService.setCreateUser(String.valueOf("a9e5507f-e7da-4ec6-b8db-9a1e4d1b7c29")); @@ -718,7 +719,7 @@ public class MatDeliverFacade { patientService.setParentid(babyModel.getId()); patientService.setPid(babyModel.getPid()); try { - patientServiceFacade.addPatientService(patientService, Integer.parseInt(patients.getBookbuildingDoctor()),babyModel.getHospitalId()); + patientServiceFacade.addPatientService(patientService, Integer.parseInt(patients.getBookbuildingDoctor()), babyModel.getHospitalId()); } catch (Exception e) { System.out.println("儿童建档服务开通异常！"); e.printStackTrace(); @@ -753,15 +754,11 @@ public class MatDeliverFacade { String hospital = autoMatchFacade.getHospitalId(userId); //聊城东昌府分娩界面通过住院号从his中查询到孕妇的身份号码，然后用身份证号码作为院内系统的查询条件查询孕妇信息 - if ("2100001305".equals(hospital) && StringUtils.isNotEmpty(deliverQueryRequest.getZhuYuanNo())) - { + if ("2100001305".equals(hospital) && StringUtils.isNotEmpty(deliverQueryRequest.getZhuYuanNo())) { LcdcfHisModel lcdcfHisModel = lcdcfHisService.getHisPatientByZyh(deliverQueryRequest.getZhuYuanNo()); - if (lcdcfHisModel != null && StringUtils.isNotEmpty(lcdcfHisModel.getIdCard())) - { + if (lcdcfHisModel != null && StringUtils.isNotEmpty(lcdcfHisModel.getIdCard())) { deliverQueryRequest.setCardNo(lcdcfHisModel.getIdCard()); - } - else - { + } else { return new BaseResponse().setErrormsg("该孕妇还未在本院建档不能进行分娩").setErrorcode(ErrorCodeConstants.NO_DATA); } } @@ -1311,12 +1308,12 @@ public class MatDeliverFacade { patientsQuery.setFmDateEnd(DateUtil.getSNDate(matdeliverFollowRequest.getBirthDate())[1]); } - if(matdeliverFollowRequest.getFollowStage()!=null){//按访视阶段查询 - if(matdeliverFollowRequest.getFollowStage() == 1){//1、访视期内 分娩时间为：21天到当前时间 - patientsQuery.setFmDateStart(DateUtil.addDay(new Date(),-22)); + if (matdeliverFollowRequest.getFollowStage() != null) {//按访视阶段查询 + if (matdeliverFollowRequest.getFollowStage() == 1) {//1、访视期内 分娩时间为：21天到当前时间 + patientsQuery.setFmDateStart(DateUtil.addDay(new Date(), -22)); patientsQuery.setFmDateEnd(new Date()); - }else if(matdeliverFollowRequest.getFollowStage() == 2){//2、超出访视期 分娩时间为：结束时间为：21天前的 - patientsQuery.setFmDateEnd(DateUtil.addDay(new Date(),-22)); + } else if (matdeliverFollowRequest.getFollowStage() == 2) {//2、超出访视期 分娩时间为：结束时间为：21天前的 + patientsQuery.setFmDateEnd(DateUtil.addDay(new Date(), -22)); } } patientsQuery.setFmHospitalQueryList(hospitalList); @@ -1339,12 +1336,12 @@ public class MatDeliverFacade { matDeliverQuery.setCreatedStart(DateUtil.getSNDate(matdeliverFollowRequest.getBirthDate())[0]); matDeliverQuery.setEndStart(DateUtil.getSNDate(matdeliverFollowRequest.getBirthDate())[1]); } - if(matdeliverFollowRequest.getFollowStage()!=null){//按访视阶段查询 - if(matdeliverFollowRequest.getFollowStage() == 1){//1、访视期内 分娩时间为：21天到当前时间 - matDeliverQuery.setCreatedStart(DateUtil.addDay(new Date(),-22)); + if (matdeliverFollowRequest.getFollowStage() != null) {//按访视阶段查询 + if (matdeliverFollowRequest.getFollowStage() == 1) {//1、访视期内 分娩时间为：21天到当前时间 + matDeliverQuery.setCreatedStart(DateUtil.addDay(new Date(), -22)); matDeliverQuery.setEndStart(new Date()); - }else if(matdeliverFollowRequest.getFollowStage() == 2){//2、超出访视期 分娩时间为：结束时间为：21天前的 - matDeliverQuery.setEndStart(DateUtil.addDay(new Date(),-22)); + } else if (matdeliverFollowRequest.getFollowStage() == 2) {//2、超出访视期 分娩时间为：结束时间为：21天前的 + matDeliverQuery.setEndStart(DateUtil.addDay(new Date(), -22)); } } @@ -1361,12 +1358,12 @@ public class MatDeliverFacade { matDeliverQuery.setMakeType(matdeliverFollowRequest.getMakeType()); List maternalDeliverModelList; - if(StringUtils.isNotEmpty(matdeliverFollowRequest.getNeed())){//是否分页 + if (StringUtils.isNotEmpty(matdeliverFollowRequest.getNeed())) {//是否分页 matDeliverQuery.setNeed("need"); matDeliverQuery.setLimit(matdeliverFollowRequest.getLimit()); matDeliverQuery.setPage(matdeliverFollowRequest.getPage()); maternalDeliverModelList = matDeliverService.pageQuery(matDeliverQuery); - }else{ + } else { maternalDeliverModelList = matDeliverService.query(matDeliverQuery); } @@ -1431,7 +1428,7 @@ public class MatDeliverFacade { //预约联系结果 if (deliverModel.getContactResult() != null) { matdeliverFollowListResult.setContactResultStr(PostpartumFollowMakeEnums.ResultEnum.getTitle(deliverModel.getContactResult())); - if(deliverModel.getContactResult() == 1){//预约成功，返回访视类型 + if (deliverModel.getContactResult() == 1) {//预约成功，返回访视类型 //访视类型 if (deliverModel.getMakeType() != null) { matdeliverFollowListResult.setMakeType(PostpartumFollowMakeEnums.TypeEnum.getTitle(deliverModel.getMakeType())); @@ -1444,7 +1441,6 @@ public class MatDeliverFacade { } - //下次访视时间 if (deliverModel.getNextVisitDate() != null) { matdeliverFollowListResult.setNextVisitDate(DateUtil.getyyyy_MM_dd(deliverModel.getNextVisitDate())); @@ -1459,10 +1455,10 @@ public class MatDeliverFacade { } matdeliverFollowListResult.setFollowStage(2); - if(StringUtils.isNotEmpty(deliverModel.getDueDate())){//根据分娩时间判断访视时间是否过期 + if (StringUtils.isNotEmpty(deliverModel.getDueDate())) {//根据分娩时间判断访视时间是否过期 Date resultDate = DateUtil.parseYMD(deliverModel.getDueDate()); - boolean isScope = DateUtil.isBetween(resultDate,DateUtil.addDay(new Date(),-22),new Date()); - matdeliverFollowListResult.setFollowStage(isScope?1:2); + boolean isScope = DateUtil.isBetween(resultDate, DateUtil.addDay(new Date(), -22), new Date()); + matdeliverFollowListResult.setFollowStage(isScope ? 1 : 2); } matdeliverFollowListResults.add(matdeliverFollowListResult); } 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 7017e13..c02c305 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 @@ -284,8 +284,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() == 1 || (patient.getIsAutoFm() != null && patient.getIsAutoFm() == 1)) {//终止妊娠,或自动分娩 + //终止妊娠,或自动分娩 + 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) { @@ -323,7 +323,7 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS temp.put("chfc", 1); temp.put("chfcCount", postInt); // 复查次数 } else { - if (patient.getDueStatus() == 1) {//终止妊娠 + if (patient.getDueStatus()!=null && patient.getDueStatus() == 1) {//终止妊娠 //当前孕妇是孕28周后，进入产后复查追访，否则结束流程 int dueWeek = DateUtil.getWeek2(patient.getLastMenses(), patient.getFmDate()); if (dueWeek < 28) {//进入产后复查 @@ -456,12 +456,12 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS if (StringUtils.isNotEmpty(trackDownRecord.getId())) { TrackDownRecord trackDownRecord1 = trackDownRecordService.getTrackDown(trackDownRecord.getId()); if (trackDownRecord1 != null) { - //流程只能往下流转，不能往上回退 - if (trackDownRecord.getTrackType() != null && trackDownRecord.getTrackType() < trackDownRecord1.getTrackType().intValue()) { + //流程只能往下流转，不能往上回退,，因为9,10,11,12,是后面加入的产筛转出流程所以不做判断 + /* if (trackDownRecord.getTrackType() != null && trackDownRecord.getTrackType() < trackDownRecord1.getTrackType().intValue()) { //用以前追访的类型和来源id trackDownRecord.setTrackType(trackDownRecord1.getTrackType()); trackDownRecord.setSource(trackDownRecord1.getSource()); - } + }*/ //由显示修改成不显示，后期数据更新时，不允许将不显示修改成显示。 if (trackDownRecord1.getStatus() < trackDownRecord.getStatus()) { trackDownRecord.setStatus(trackDownRecord1.getStatus()); -- 1.8.3.1