diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java index 5bb19b7..1ece7ec 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java @@ -127,11 +127,8 @@ public class LisServiceImpl implements LisService { for(LisReportModel model : lisList) { try { - List dbLis = masterLisMapper.queryLisDataByLisIdAndHid(model); - if (CollectionUtils.isEmpty(dbLis)) - { - masterLisMapper.saveLisData(model); - } + masterLisMapper.deleteLisData(model); + masterLisMapper.saveLisData(model); } catch (Exception e) { continue; diff --git a/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java index 72e7344..0180609 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java @@ -95,6 +95,7 @@ public class MatDeliverQuery extends BaseQuery implements IConvertToNativeQuery private String fmHospital; private List fmHospitalList; private String fsHospital; + private String fsHospitalId; /** * 预约联系结果（1-成功、2-失败） */ @@ -158,6 +159,14 @@ public class MatDeliverQuery extends BaseQuery implements IConvertToNativeQuery private Integer endAge; + public String getFsHospitalId() { + return fsHospitalId; + } + + public void setFsHospitalId(String fsHospitalId) { + this.fsHospitalId = fsHospitalId; + } + public Integer getStartAge() { return startAge; } @@ -315,6 +324,11 @@ public class MatDeliverQuery extends BaseQuery implements IConvertToNativeQuery condition = condition.and("fmHospital", fmHospital, MongoOper.IS); } } + if (null != fsHospitalId) { + condition = condition.and("fmHospital", fsHospitalId, MongoOper.IS); + } + + if (null != deliveryModeQueryJson) { condition = condition.and("deliveryMode", deliveryModeQueryJson, MongoOper.LIKE); } diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/Cdfy/CdGwInterface.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/Cdfy/CdGwInterface.java index ef08314..ae635fb 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/Cdfy/CdGwInterface.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/Cdfy/CdGwInterface.java @@ -81,9 +81,10 @@ public class CdGwInterface { private BabyCheckService babyCheckService; //测试地址 - private static final String BASE_URL = "http://gxgg.greatsoft.net:8082"; - //线上地址 -// private static final String BASE_URL = "http://192.168.100.3:7076"; +// private static final String BASE_URL = "http://gxgg.greatsoft.net:8082"; + //线上地址222.223.187.132:7076 +// private static final String BASE_URL = "http://gxgg.greatsoft.net:8083"; + private static final String BASE_URL = "http://10.0.255.31:7076"; /** @@ -139,6 +140,7 @@ public class CdGwInterface { ResultSet rs = null; try { String id= getPersonId( patient); + System.out.println("saveBaseInfo id = "+id); if (id != null) { @@ -286,16 +288,19 @@ public class CdGwInterface { br.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION); return br; } else { + System.out.println("产后居住地址信息保存有误 id = "+id); br.setErrorcode(-1); br.setErrormsg("产后居住地址信息保存有误！"); return br; } } else { + System.out.println("居住地址信息保存有误 id = "+id); br.setErrorcode(-1); br.setErrormsg("居住地址信息保存有误！"); return br; } } else { + System.out.println("户籍地址信息保存有误 id = "+id); br.setErrorcode(-1); br.setErrormsg("户籍地址信息保存有误！"); return br; @@ -3683,20 +3688,27 @@ public class CdGwInterface { */ public BaseObjectResponse saveYf(String startDate,String endDate){ BaseObjectResponse br = null; - PatientsQuery patientsQuery = new PatientsQuery(); - patientsQuery.setCreatedTimeStart(DateUtil.parseYMDHMS(startDate)); - patientsQuery.setCreatedTimeEnd(DateUtil.parseYMDHMS(endDate)); - List list = patientsService.queryPatient(patientsQuery); - if(list != null && list.size()>0){ - for(Patients patients : list){ - try{ - br = saveBaseInfo(patients); - }catch (Exception e){ - ExceptionUtils.catchException(e, "saveYf error."); - continue; - } + try{ + PatientsQuery patientsQuery = new PatientsQuery(); + patientsQuery.setModifiedStart(DateUtil.parseYMDHMS(startDate)); + patientsQuery.setModifiedEnd(DateUtil.parseYMDHMS(endDate)); + List list = patientsService.queryPatient(patientsQuery); + System.out.println(DateUtil.getyyyy_MM_dd_hms(new java.util.Date())+" pateient size = "+ list.size()); + if(list != null && list.size()>0){ + for(Patients patients : list){ + try{ + br = saveBaseInfo(patients); + }catch (Exception e){ + ExceptionUtils.catchException(e, "saveYf error."); + continue; + } + + } } + }catch (Exception e) + { + ExceptionUtils.catchException(e, "get patientsService error."); } return br; } @@ -3713,8 +3725,8 @@ public class CdGwInterface { public BaseObjectResponse saveChuZhen(String startDate,String endDate){ BaseObjectResponse br = null; AntExChuQuery antExChuQuery = new AntExChuQuery(); - antExChuQuery.setCreatedTimeStart(DateUtil.parseYMDHMS(startDate)); - antExChuQuery.setCreatedTimeEnd(DateUtil.parseYMDHMS(endDate)); + antExChuQuery.setModifiedStart(DateUtil.parseYMDHMS(startDate)); + antExChuQuery.setModifiedEnd(DateUtil.parseYMDHMS(endDate)); List list = antExService.queryAntExChu(antExChuQuery); if(list != null && list.size()>0){ for(AntExChuModel antExChuModel : list){ @@ -3740,8 +3752,8 @@ public class CdGwInterface { public BaseObjectResponse saveFuZhen(String startDate,String endDate){ BaseObjectResponse br = null; AntExQuery antExQuery = new AntExQuery(); - antExQuery.setCreatedTimeStart(DateUtil.parseYMDHMS(startDate)); - antExQuery.setCreatedTimeEnd(DateUtil.parseYMDHMS(endDate)); + antExQuery.setModifiedStart(DateUtil.parseYMDHMS(startDate)); + antExQuery.setModifiedEnd(DateUtil.parseYMDHMS(endDate)); //antExQuery.setId("5b2b4a760cf24b66d2c0af28"); List list = antExService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created")); if(list != null && list.size()>0){ @@ -3769,8 +3781,8 @@ public class CdGwInterface { public BaseObjectResponse saveFm(String startDate,String endDate){ BaseObjectResponse br = null; MatDeliverQuery deliverQuery = new MatDeliverQuery(); - deliverQuery.setCreatedTimeStart(DateUtil.parseYMDHMS(startDate)); - deliverQuery.setCreatedTimeEnd(DateUtil.parseYMDHMS(endDate)); + deliverQuery.setModifiedStart(DateUtil.parseYMDHMS(startDate)); + deliverQuery.setModifiedEnd(DateUtil.parseYMDHMS(endDate)); List list = matDeliverService.query(deliverQuery); if(null != list && list.size() > 0){ for(MaternalDeliverModel maternalDeliverModel : list){ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AnnualReportFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AnnualReportFacade.java index e49e327..d3db2fe 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AnnualReportFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AnnualReportFacade.java @@ -425,21 +425,26 @@ public class AnnualReportFacade { int patientCount = patientsService.queryPatientCount(patientsQuerys); //产检 人数 - AntExRecordQuery antExRecordQuery = new AntExRecordQuery(); - if (StringUtils.isNotEmpty(time)) { - antExRecordQuery.setCheckTimeStart(DateUtil.getSNDate(time)[0]); - antExRecordQuery.setCheckTimeEnd(DateUtil.getSNDate(time)[1]); - } - antExRecordQuery.setHospitalList(entry.getValue()); - List antExRecordModels = antExRecordService.queryAntExRecords(antExRecordQuery); - Map antexMap = new HashMap<>(); +// AntExRecordQuery antExRecordQuery = new AntExRecordQuery(); +// if (StringUtils.isNotEmpty(time)) { +// antExRecordQuery.setCheckTimeStart(DateUtil.getSNDate(time)[0]); +// antExRecordQuery.setCheckTimeEnd(DateUtil.getSNDate(time)[1]); +// } +// antExRecordQuery.setHospitalList(entry.getValue()); +// List antExRecordModels = antExRecordService.queryAntExRecords(antExRecordQuery); +// Map antexMap = new HashMap<>(); +// List count = new ArrayList<>(); +// for (AntExRecordModel antExRecord : antExRecordModels) { +// antexMap.put(antExRecord.getParentId(), ""); +// count.add(antExRecord.getParentId()); +// } +// List count = new ArrayList<>(); - for (AntExRecordModel antExRecord : antExRecordModels) { - antexMap.put(antExRecord.getParentId(), ""); - count.add(antExRecord.getParentId()); - } + Map antexMap = new HashMap<>(); map.put("antexCount", String.valueOf(antexMap.size())); map.put("antexPercent", this.division(antexMap.size(), patientCount)); + + //产检>=5次 Map maps = new HashMap<>(); for (String string : count) { 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 e5d036d..ac2f501 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 @@ -1744,6 +1744,7 @@ public class MatDeliverFacade { MatDeliverFollowQuery matDeliverFollowQuery = new MatDeliverFollowQuery(); matDeliverFollowQuery.setVisitStartDate(matdeliverFollowRequest.getFollowStarDate()); matDeliverFollowQuery.setVisitEndDate(matdeliverFollowRequest.getFollowEndDate()); + List matdeliverFollowModels = matDeliverFollowService.query(matDeliverFollowQuery); List mfIds = new ArrayList<>(); for (MatdeliverFollowModel md : matdeliverFollowModels) { @@ -1827,6 +1828,10 @@ public class MatDeliverFacade { matDeliverQuery.setFmHospitalList(hospitalList); matDeliverQuery.setFsHospital(hospitalId); + if (StringUtils.isNotEmpty(matdeliverFollowRequest.getFsHospitalId())) + { + matDeliverQuery.setFsHospitalId(matdeliverFollowRequest.getFsHospitalId()); + } matDeliverQuery.setContactResult(matdeliverFollowRequest.getContactResult()); if (matdeliverFollowRequest.getContactReason() != null) { matDeliverQuery.setContactResult(PostpartumFollowMakeEnums.ResultEnum.SB.getId()); @@ -1856,6 +1861,8 @@ public class MatDeliverFacade { matDeliverQuery.setNeed("need"); matDeliverQuery.setLimit(matdeliverFollowRequest.getLimit()); matDeliverQuery.setPage(matdeliverFollowRequest.getPage()); + + System.out.println(matDeliverQuery.convertToQuery().convertToMongoQuery().toString()); maternalDeliverModelList = matDeliverService.pageQuery(matDeliverQuery); } else { maternalDeliverModelList = matDeliverService.query(matDeliverQuery); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatdeliverFollowRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatdeliverFollowRequest.java index 7277e3a..6e3e8bab 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatdeliverFollowRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatdeliverFollowRequest.java @@ -98,6 +98,17 @@ public class MatdeliverFollowRequest extends BasePageQueryRequest{ private Integer startDay; private Integer endDay; + //访视机构 + private String fsHospitalId; + + public String getFsHospitalId() { + return fsHospitalId; + } + + public void setFsHospitalId(String fsHospitalId) { + this.fsHospitalId = fsHospitalId; + } + public String getRiskId() { return riskId; }