diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/rcfy/RcGlxtService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/rcfy/RcGlxtService.java index 133a3c3..3d4fc74 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/rcfy/RcGlxtService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/rcfy/RcGlxtService.java @@ -1513,7 +1513,7 @@ public class RcGlxtService { patientsQuery1.setModifiedStart(start); patientsQuery1.setHospitalList(hids); List patientses = patientsService.queryPatient(patientsQuery1); - System.out.println("xxxxxxpatientses="+patientses.size()+"===="+patientsQuery1.convertToQuery().convertToMongoQuery().toString()); + //System.out.println("xxxxxxpatientses="+patientses.size()+"===="+patientsQuery1.convertToQuery().convertToMongoQuery().toString()); if (org.apache.commons.collections.CollectionUtils.isNotEmpty(patientses)) { for (Patients pat : patientses) @@ -1530,7 +1530,7 @@ public class RcGlxtService { matDeliverQuery.setModifiedStart(start); matDeliverQuery.setModifiedEnd(end); List list2 = matDeliverService.query(matDeliverQuery); - System.out.println("xxxxxx fm="+list2.size()+"===="+matDeliverQuery.convertToQuery().convertToMongoQuery().toString()); + //System.out.println("xxxxxx fm="+list2.size()+"===="+matDeliverQuery.convertToQuery().convertToMongoQuery().toString()); if (org.apache.commons.collections.CollectionUtils.isNotEmpty(list2)) { for (MaternalDeliverModel maternalDeliverModel : list2) @@ -1547,7 +1547,7 @@ public class RcGlxtService { matDeliverQuery1.setModifiedStart(start); matDeliverQuery1.setModifiedEnd(end); List list1 = matDeliverService.query(matDeliverQuery1); - System.out.println("xxxxxx new baby="+list1.size()+"===="+matDeliverQuery1.convertToQuery().convertToMongoQuery().toString()); + // System.out.println("xxxxxx new baby="+list1.size()+"===="+matDeliverQuery1.convertToQuery().convertToMongoQuery().toString()); if (org.apache.commons.collections.CollectionUtils.isNotEmpty(list1)) { for (MaternalDeliverModel maternalDeliverModel : list1) @@ -1562,7 +1562,7 @@ public class RcGlxtService { matDeliverFollowQuery.setCreatedTimeStart(start); matDeliverFollowQuery.setVisitStatus(2); List matdeliverFollowModels = matDeliverFollowService.query(matDeliverFollowQuery); - System.out.println("xxxxxx fs="+matdeliverFollowModels.size()+"===="+matDeliverFollowQuery.convertToQuery().convertToMongoQuery().toString()); + //System.out.println("xxxxxx fs="+matdeliverFollowModels.size()+"===="+matDeliverFollowQuery.convertToQuery().convertToMongoQuery().toString()); if (CollectionUtils.isNotEmpty(matdeliverFollowModels)) { for (MatdeliverFollowModel matdeliverFollowModel : matdeliverFollowModels) @@ -1580,7 +1580,7 @@ public class RcGlxtService { query.setHospitalIds(hids); query.setSexType(1); List checkupList = premaritalCheckupService.queryPremaritalCheckup(query); - System.out.println("xxxxxx hj="+checkupList.size()+"===="+query.convertToQuery().convertToMongoQuery().toString()); + //System.out.println("xxxxxx hj="+checkupList.size()+"===="+query.convertToQuery().convertToMongoQuery().toString()); if (CollectionUtils.isNotEmpty(checkupList)) { for (PremaritalCheckup premaritalCheckup : checkupList) @@ -1596,7 +1596,7 @@ public class RcGlxtService { folicAcidQuery.setModifiedEnd(end); folicAcidQuery.setHospitalList(hids); List folicAcidList = folicAcidService.queryFolicAcidWithSort(folicAcidQuery, "drawTime", Sort.Direction.ASC); - System.out.println("xxxxxx ys="+folicAcidList.size()+"===="+folicAcidQuery.convertToQuery().convertToMongoQuery().toString()); + //System.out.println("xxxxxx ys="+folicAcidList.size()+"===="+folicAcidQuery.convertToQuery().convertToMongoQuery().toString()); if (CollectionUtils.isNotEmpty(folicAcidList)) { for (FolicAcid folicAcid : folicAcidList) @@ -1612,7 +1612,7 @@ public class RcGlxtService { sieveResultQuery.setModifiedStart(start); sieveResultQuery.setModifiedEnd(end); List list = sieveService.queryListSieveResult(sieveResultQuery); - System.out.println("xxxxxx sieve=" + list.size()+"===="+sieveResultQuery.convertToQuery().convertToMongoQuery().toString()); + //System.out.println("xxxxxx sieve=" + list.size()+"===="+sieveResultQuery.convertToQuery().convertToMongoQuery().toString()); if (org.apache.commons.collections.CollectionUtils.isNotEmpty(list)) { for (SieveResultModel sieveResultModel : list) @@ -1627,7 +1627,7 @@ public class RcGlxtService { antExRecordQuery.setModifiedStart(start); antExRecordQuery.setModifiedEnd(end); List recordModels = recordService.queryAntExRecords(antExRecordQuery); - System.out.println("xxxxxx recordModels=" + recordModels.size()+"===="+antExRecordQuery.convertToQuery().convertToMongoQuery().toString()); + //System.out.println("xxxxxx recordModels=" + recordModels.size()+"===="+antExRecordQuery.convertToQuery().convertToMongoQuery().toString()); if (org.apache.commons.collections.CollectionUtils.isNotEmpty(recordModels)) { for (AntExRecordModel antExRecordModel : recordModels) @@ -1644,7 +1644,7 @@ public class RcGlxtService { antExChuQuery.setModifiedStart(start); antExChuQuery.setModifiedEnd(end); List antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery); - System.out.println("xxxxxx antExChuModels=" + antExChuModels.size()+"===="+antExChuQuery.convertToQuery().convertToMongoQuery().toString()); + //System.out.println("xxxxxx antExChuModels=" + antExChuModels.size()+"===="+antExChuQuery.convertToQuery().convertToMongoQuery().toString()); if (CollectionUtils.isNotEmpty(antExChuModels)) { for (AntExChuModel chuModel : antExChuModels) @@ -1662,7 +1662,7 @@ public class RcGlxtService { antExQuery.setModifiedStart(start); antExQuery.setModifiedEnd(end); List antEx = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery()); - System.out.println("xxxxxx antEx=" + antEx.size()+"===="+antExQuery.convertToQuery().convertToMongoQuery().toString()); + //System.out.println("xxxxxx antEx=" + antEx.size()+"===="+antExQuery.convertToQuery().convertToMongoQuery().toString()); if (CollectionUtils.isNotEmpty(antEx)) { for (AntenatalExaminationModel f : antEx) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 2e6cf9f..3887cc2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -24,12 +24,10 @@ import com.lyms.platform.operate.web.service.ITrackDownService; import com.lyms.platform.operate.web.utils.BabyListTask; import com.lyms.platform.operate.web.utils.GrowthCountTask; import com.lyms.platform.operate.web.utils.MongoUtil; -import com.lyms.platform.permission.model.Organization; -import com.lyms.platform.permission.model.OrganizationQuery; -import com.lyms.platform.permission.model.PatientService; -import com.lyms.platform.permission.model.Users; +import com.lyms.platform.permission.model.*; import com.lyms.platform.permission.service.CouponService; import com.lyms.platform.permission.service.OrganizationService; +import com.lyms.platform.permission.service.PatientServiceService; import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.*; import com.lyms.platform.query.*; @@ -84,6 +82,9 @@ public class BabyBookbuildingFacade { private BabyBookbuildingService babyBookbuildingService; @Autowired + private PatientServiceService patientServiceService; + + @Autowired private BasicConfigFacade basicConfigFacade; @Autowired @@ -365,7 +366,7 @@ public class BabyBookbuildingFacade { * @return */ public BaseResponse updateBabyBookbuilding(BabyBookbuildingAddRequest request, Integer userId) { - BabyModel model = getBabyModel(request,true); + BabyModel model = getBabyModel(request,true,userId); model.setModified(new Date()); model.setOperator(userId); if (StringUtils.isNotEmpty(request.getMommyCertificateNum())) { @@ -717,7 +718,7 @@ public class BabyBookbuildingFacade { return br; } - BabyModel model = getBabyModel(request,true); + BabyModel model = getBabyModel(request,true,userId); model.setmHighRiskReason(request.getmHighRiskReason()); model.setPid(babyPersonId); model.setOperator(userId); @@ -1043,7 +1044,7 @@ public class BabyBookbuildingFacade { * @param b * @return */ - private BabyModel getBabyModel(BabyBookbuildingAddRequest b,boolean isAdd) { + private BabyModel getBabyModel(BabyBookbuildingAddRequest b,boolean isAdd,Integer userId) { // hujiaqi添加了一个字段,判断是插入还是更新,如果是更新,就不更新birth字段 BabyModel bm = new BabyModel(); @@ -1172,20 +1173,52 @@ public class BabyBookbuildingFacade { //建档开通增值服务,以前数据 if (CollectionUtils.isNotEmpty(b.getSerInfos())) { - for (Map serInfo : b.getSerInfos()) { - //标准服务 - if (Integer.parseInt(serInfo.get("serType")) == PatientSerEnums.SerTypeEnums.babyBzfw.getId()) { - bm.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); - bm.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId()); - }else if(Integer.parseInt(serInfo.get("serType")) == PatientSerEnums.SerTypeEnums.babyjzzz.getId()){//增值服务:修改为孕期精准指导 - bm.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId()); - bm.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId()); - break; +// for (Map serInfo : b.getSerInfos()) { +// //标准服务 +// if (Integer.parseInt(serInfo.get("serType")) == PatientSerEnums.SerTypeEnums.babyBzfw.getId()) { +// bm.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); +// bm.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId()); +// }else if(Integer.parseInt(serInfo.get("serType")) == PatientSerEnums.SerTypeEnums.babyjzzz.getId()){//增值服务:修改为孕期精准指导 +// bm.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId()); +// bm.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId()); +// break; +// } +// } + try { + + PatientServiceQuery patientQuery = new PatientServiceQuery(); + patientQuery.setParentid(b.getId()); + + List services = patientServiceService.queryPatientService(patientQuery); + if (CollectionUtils.isNotEmpty(services)) + { + PatientService patientService = services.get(0); + patientServiceService.deletePatientService(patientService.getId()); } + PatientService patientService = new PatientService(); + patientService.setPerType(2); + patientService.setSerInfos(b.getSerInfos()); + patientService.setCreateUser(String.valueOf(userId)); + //开通日期与建档日期一致 + patientService.setCreateDate(new Date()); + patientService.setParentid(b.getId()); + + BabyModelQuery babyQuery = new BabyModelQuery(); + babyQuery.setId(b.getId()); + List babyModels = babyBookbuildingService.queryBabyBuildByCond(babyQuery); + if (CollectionUtils.isNotEmpty(babyModels)) + { + patientService.setPid(babyModels.get(0).getPid()); + } + patientServiceFacade.addPatientService(patientService, userId, b.getHospitalId()); + + + } catch (Exception e) { + System.out.println("儿童修改服务开通异常!"); + e.printStackTrace(); } } - bm.setDueDate(DateUtil.parseYMD(b.getDueDate())); bm.setDueType(b.getDueType()); bm.setMalformation(b.getMalformation());