jiangjiazhi / regional-platform

Download as
Browse Code »

Commit ec8facf12bd0176557117e19af68553147590ef3

Authored by liquanyu
1 parent b065ab1305
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

访视

Showing 6 changed files with 84 additions and 38 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java View file @ ec8facf
... ... @@ -127,11 +127,8 @@
127 127 for(LisReportModel model : lisList)
128 128 {
129 129 try {
130   - List<LisReportModel> dbLis = masterLisMapper.queryLisDataByLisIdAndHid(model);
131   - if (CollectionUtils.isEmpty(dbLis))
132   - {
133   - masterLisMapper.saveLisData(model);
134   - }
  130 + masterLisMapper.deleteLisData(model);
  131 + masterLisMapper.saveLisData(model);
135 132 } catch (Exception e)
136 133 {
137 134 continue;
platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java View file @ ec8facf
... ... @@ -95,6 +95,7 @@
95 95 private String fmHospital;
96 96 private List<String> fmHospitalList;
97 97 private String fsHospital;
  98 + private String fsHospitalId;
98 99 /**
99 100 * 预约联系结果（1-成功、2-失败）
100 101 */
... ... @@ -158,6 +159,14 @@
158 159  
159 160 private Integer endAge;
160 161  
  162 + public String getFsHospitalId() {
  163 + return fsHospitalId;
  164 + }
  165 +
  166 + public void setFsHospitalId(String fsHospitalId) {
  167 + this.fsHospitalId = fsHospitalId;
  168 + }
  169 +
161 170 public Integer getStartAge() {
162 171 return startAge;
163 172 }
... ... @@ -315,6 +324,11 @@
315 324 condition = condition.and("fmHospital", fmHospital, MongoOper.IS);
316 325 }
317 326 }
  327 + if (null != fsHospitalId) {
  328 + condition = condition.and("fmHospital", fsHospitalId, MongoOper.IS);
  329 + }
  330 +
  331 +
318 332 if (null != deliveryModeQueryJson) {
319 333 condition = condition.and("deliveryMode", deliveryModeQueryJson, MongoOper.LIKE);
320 334 }
platform-operate-api/src/main/java/com/lyms/hospitalapi/Cdfy/CdGwInterface.java View file @ ec8facf
... ... @@ -81,9 +81,10 @@
81 81 private BabyCheckService babyCheckService;
82 82  
83 83 //测试地址
84   - private static final String BASE_URL = "http://gxgg.greatsoft.net:8082";
85   - //线上地址
86   -// private static final String BASE_URL = "http://192.168.100.3:7076";
  84 +// private static final String BASE_URL = "http://gxgg.greatsoft.net:8082";
  85 + //线上地址222.223.187.132:7076
  86 +// private static final String BASE_URL = "http://gxgg.greatsoft.net:8083";
  87 + private static final String BASE_URL = "http://10.0.255.31:7076";
87 88  
88 89  
89 90 /**
... ... @@ -139,6 +140,7 @@
139 140 ResultSet rs = null;
140 141 try {
141 142 String id= getPersonId( patient);
  143 + System.out.println("saveBaseInfo id = "+id);
142 144 if (id != null)
143 145 {
144 146  
145 147  
146 148  
... ... @@ -286,16 +288,19 @@
286 288 br.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION);
287 289 return br;
288 290 } else {
  291 + System.out.println("产后居住地址信息保存有误 id = "+id);
289 292 br.setErrorcode(-1);
290 293 br.setErrormsg("产后居住地址信息保存有误！");
291 294 return br;
292 295 }
293 296 } else {
  297 + System.out.println("居住地址信息保存有误 id = "+id);
294 298 br.setErrorcode(-1);
295 299 br.setErrormsg("居住地址信息保存有误！");
296 300 return br;
297 301 }
298 302 } else {
  303 + System.out.println("户籍地址信息保存有误 id = "+id);
299 304 br.setErrorcode(-1);
300 305 br.setErrormsg("户籍地址信息保存有误！");
301 306 return br;
302 307  
303 308  
... ... @@ -3683,20 +3688,27 @@
3683 3688 */
3684 3689 public BaseObjectResponse saveYf(String startDate,String endDate){
3685 3690 BaseObjectResponse br = null;
3686   - PatientsQuery patientsQuery = new PatientsQuery();
3687   - patientsQuery.setCreatedTimeStart(DateUtil.parseYMDHMS(startDate));
3688   - patientsQuery.setCreatedTimeEnd(DateUtil.parseYMDHMS(endDate));
3689   - List<Patients> list = patientsService.queryPatient(patientsQuery);
3690   - if(list != null && list.size()>0){
3691   - for(Patients patients : list){
3692   - try{
3693   - br = saveBaseInfo(patients);
3694   - }catch (Exception e){
3695   - ExceptionUtils.catchException(e, "saveYf error.");
3696   - continue;
3697   - }
3698 3691  
  3692 + try{
  3693 + PatientsQuery patientsQuery = new PatientsQuery();
  3694 + patientsQuery.setModifiedStart(DateUtil.parseYMDHMS(startDate));
  3695 + patientsQuery.setModifiedEnd(DateUtil.parseYMDHMS(endDate));
  3696 + List<Patients> list = patientsService.queryPatient(patientsQuery);
  3697 + System.out.println(DateUtil.getyyyy_MM_dd_hms(new java.util.Date())+" pateient size = "+ list.size());
  3698 + if(list != null && list.size()>0){
  3699 + for(Patients patients : list){
  3700 + try{
  3701 + br = saveBaseInfo(patients);
  3702 + }catch (Exception e){
  3703 + ExceptionUtils.catchException(e, "saveYf error.");
  3704 + continue;
  3705 + }
  3706 +
  3707 + }
3699 3708 }
  3709 + }catch (Exception e)
  3710 + {
  3711 + ExceptionUtils.catchException(e, "get patientsService error.");
3700 3712 }
3701 3713 return br;
3702 3714 }
... ... @@ -3713,8 +3725,8 @@
3713 3725 public BaseObjectResponse saveChuZhen(String startDate,String endDate){
3714 3726 BaseObjectResponse br = null;
3715 3727 AntExChuQuery antExChuQuery = new AntExChuQuery();
3716   - antExChuQuery.setCreatedTimeStart(DateUtil.parseYMDHMS(startDate));
3717   - antExChuQuery.setCreatedTimeEnd(DateUtil.parseYMDHMS(endDate));
  3728 + antExChuQuery.setModifiedStart(DateUtil.parseYMDHMS(startDate));
  3729 + antExChuQuery.setModifiedEnd(DateUtil.parseYMDHMS(endDate));
3718 3730 List<AntExChuModel> list = antExService.queryAntExChu(antExChuQuery);
3719 3731 if(list != null && list.size()>0){
3720 3732 for(AntExChuModel antExChuModel : list){
... ... @@ -3740,8 +3752,8 @@
3740 3752 public BaseObjectResponse saveFuZhen(String startDate,String endDate){
3741 3753 BaseObjectResponse br = null;
3742 3754 AntExQuery antExQuery = new AntExQuery();
3743   - antExQuery.setCreatedTimeStart(DateUtil.parseYMDHMS(startDate));
3744   - antExQuery.setCreatedTimeEnd(DateUtil.parseYMDHMS(endDate));
  3755 + antExQuery.setModifiedStart(DateUtil.parseYMDHMS(startDate));
  3756 + antExQuery.setModifiedEnd(DateUtil.parseYMDHMS(endDate));
3745 3757 //antExQuery.setId("5b2b4a760cf24b66d2c0af28");
3746 3758 List<AntenatalExaminationModel> list = antExService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created"));
3747 3759 if(list != null && list.size()>0){
... ... @@ -3769,8 +3781,8 @@
3769 3781 public BaseObjectResponse saveFm(String startDate,String endDate){
3770 3782 BaseObjectResponse br = null;
3771 3783 MatDeliverQuery deliverQuery = new MatDeliverQuery();
3772   - deliverQuery.setCreatedTimeStart(DateUtil.parseYMDHMS(startDate));
3773   - deliverQuery.setCreatedTimeEnd(DateUtil.parseYMDHMS(endDate));
  3784 + deliverQuery.setModifiedStart(DateUtil.parseYMDHMS(startDate));
  3785 + deliverQuery.setModifiedEnd(DateUtil.parseYMDHMS(endDate));
3774 3786 List<MaternalDeliverModel> list = matDeliverService.query(deliverQuery);
3775 3787 if(null != list && list.size() > 0){
3776 3788 for(MaternalDeliverModel maternalDeliverModel : list){
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AnnualReportFacade.java View file @ ec8facf
... ... @@ -425,21 +425,26 @@
425 425 int patientCount = patientsService.queryPatientCount(patientsQuerys);
426 426  
427 427 //产检 人数
428   - AntExRecordQuery antExRecordQuery = new AntExRecordQuery();
429   - if (StringUtils.isNotEmpty(time)) {
430   - antExRecordQuery.setCheckTimeStart(DateUtil.getSNDate(time)[0]);
431   - antExRecordQuery.setCheckTimeEnd(DateUtil.getSNDate(time)[1]);
432   - }
433   - antExRecordQuery.setHospitalList(entry.getValue());
434   - List<AntExRecordModel> antExRecordModels = antExRecordService.queryAntExRecords(antExRecordQuery);
435   - Map<Object, Object> antexMap = new HashMap<>();
  428 +// AntExRecordQuery antExRecordQuery = new AntExRecordQuery();
  429 +// if (StringUtils.isNotEmpty(time)) {
  430 +// antExRecordQuery.setCheckTimeStart(DateUtil.getSNDate(time)[0]);
  431 +// antExRecordQuery.setCheckTimeEnd(DateUtil.getSNDate(time)[1]);
  432 +// }
  433 +// antExRecordQuery.setHospitalList(entry.getValue());
  434 +// List<AntExRecordModel> antExRecordModels = antExRecordService.queryAntExRecords(antExRecordQuery);
  435 +// Map<Object, Object> antexMap = new HashMap<>();
  436 +// List<String> count = new ArrayList<>();
  437 +// for (AntExRecordModel antExRecord : antExRecordModels) {
  438 +// antexMap.put(antExRecord.getParentId(), "");
  439 +// count.add(antExRecord.getParentId());
  440 +// }
  441 +//
436 442 List<String> count = new ArrayList<>();
437   - for (AntExRecordModel antExRecord : antExRecordModels) {
438   - antexMap.put(antExRecord.getParentId(), "");
439   - count.add(antExRecord.getParentId());
440   - }
  443 + Map<Object, Object> antexMap = new HashMap<>();
441 444 map.put("antexCount", String.valueOf(antexMap.size()));
442 445 map.put("antexPercent", this.division(antexMap.size(), patientCount));
  446 +
  447 +
443 448 //产检>=5次
444 449 Map<String, Integer> maps = new HashMap<>();
445 450 for (String string : count) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ ec8facf
... ... @@ -1744,6 +1744,7 @@
1744 1744 MatDeliverFollowQuery matDeliverFollowQuery = new MatDeliverFollowQuery();
1745 1745 matDeliverFollowQuery.setVisitStartDate(matdeliverFollowRequest.getFollowStarDate());
1746 1746 matDeliverFollowQuery.setVisitEndDate(matdeliverFollowRequest.getFollowEndDate());
  1747 +
1747 1748 List<MatdeliverFollowModel> matdeliverFollowModels = matDeliverFollowService.query(matDeliverFollowQuery);
1748 1749 List<String> mfIds = new ArrayList<>();
1749 1750 for (MatdeliverFollowModel md : matdeliverFollowModels) {
... ... @@ -1827,6 +1828,10 @@
1827 1828  
1828 1829 matDeliverQuery.setFmHospitalList(hospitalList);
1829 1830 matDeliverQuery.setFsHospital(hospitalId);
  1831 + if (StringUtils.isNotEmpty(matdeliverFollowRequest.getFsHospitalId()))
  1832 + {
  1833 + matDeliverQuery.setFsHospitalId(matdeliverFollowRequest.getFsHospitalId());
  1834 + }
1830 1835 matDeliverQuery.setContactResult(matdeliverFollowRequest.getContactResult());
1831 1836 if (matdeliverFollowRequest.getContactReason() != null) {
1832 1837 matDeliverQuery.setContactResult(PostpartumFollowMakeEnums.ResultEnum.SB.getId());
... ... @@ -1856,6 +1861,8 @@
1856 1861 matDeliverQuery.setNeed("need");
1857 1862 matDeliverQuery.setLimit(matdeliverFollowRequest.getLimit());
1858 1863 matDeliverQuery.setPage(matdeliverFollowRequest.getPage());
  1864 +
  1865 + System.out.println(matDeliverQuery.convertToQuery().convertToMongoQuery().toString());
1859 1866 maternalDeliverModelList = matDeliverService.pageQuery(matDeliverQuery);
1860 1867 } else {
1861 1868 maternalDeliverModelList = matDeliverService.query(matDeliverQuery);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatdeliverFollowRequest.java View file @ ec8facf
... ... @@ -98,6 +98,17 @@
98 98 private Integer startDay;
99 99 private Integer endDay;
100 100  
  101 + //访视机构
  102 + private String fsHospitalId;
  103 +
  104 + public String getFsHospitalId() {
  105 + return fsHospitalId;
  106 + }
  107 +
  108 + public void setFsHospitalId(String fsHospitalId) {
  109 + this.fsHospitalId = fsHospitalId;
  110 + }
  111 +
101 112 public String getRiskId() {
102 113 return riskId;
103 114 }