jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 19e85db6467550850602ba48feb859862b5d6ebf

Authored by jesse.wang
1 parent 18135e77fc
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

眼保健管理和全部儿童数据同步 

产检次数和实际不符本院+外院，都包括的
【区域妇幼管理】---【区域妇幼统计】---【建档优惠券统计】---【发放优惠券统计】---【预约分娩医院—河北省—秦皇岛市—海港区—秦皇岛市海港区医院】。分娩医院出现了一例信息不吻合的问题

Showing 3 changed files with 40 additions and 6 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyEyeCheckFacade.java View file @ 19e85db
... ... @@ -304,7 +304,8 @@
304 304 String hospitalId = autoMatchFacade.getHospitalId(userId);
305 305 babyModelQuery.setNeed("true");
306 306 babyModelQuery.setYn(YnEnums.YES.getId());
307   - babyModelQuery.setLheyeCheckYn(YnEnums.YES.getId());
  307 + //眼保健管理和全部儿童数据同步
  308 +// babyModelQuery.setLheyeCheckYn(YnEnums.YES.getId());
308 309 babyModelQuery.setHospitalId(hospitalId);
309 310 //结束日期加上时分秒
310 311 if (babyModelQuery.getLhEyeCheckTimeEnd() != null) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java View file @ 19e85db
... ... @@ -5454,6 +5454,9 @@
5454 5454 PatientsQuery patientsQuery2 = new PatientsQuery();
5455 5455 patientsQuery2.setYn(YnEnums.YES.getId());
5456 5456 patientsQuery2.setPid(bookbuildingCoupon.get("userid").toString());
  5457 + if (StringUtils.isNotEmpty(query.getYyzyfmHospitalId())) {
  5458 + patientsQuery2.setYyzyfmHospitalId(query.getYyzyfmHospitalId());
  5459 + }
5457 5460 List<Patients> patients =patientsService.queryPatient(patientsQuery2);
5458 5461 if(CollectionUtils.isEmpty(patients)){
5459 5462 continue;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanPatientWorker.java View file @ 19e85db
... ... @@ -10,6 +10,7 @@
10 10 import com.lyms.platform.common.utils.ExceptionUtils;
11 11 import com.lyms.platform.common.utils.JsonUtil;
12 12 import com.lyms.platform.operate.web.facade.PatientFacade;
  13 +import com.lyms.platform.operate.web.result.AntData;
13 14 import com.lyms.platform.operate.web.result.HighScoreResult;
14 15 import com.lyms.platform.operate.web.result.QuanPatientsResult;
15 16 import com.lyms.platform.operate.web.utils.CommonsHelper;
... ... @@ -23,6 +24,7 @@
23 24 import com.lyms.platform.pojo.Patients;
24 25 import com.lyms.platform.query.AntExChuQuery;
25 26 import com.lyms.platform.query.AntExQuery;
  27 +import com.lyms.platform.query.PatientsQuery;
26 28 import org.apache.commons.collections.CollectionUtils;
27 29 import org.apache.commons.lang.StringUtils;
28 30 import org.apache.commons.lang.math.NumberUtils;
29 31  
... ... @@ -75,14 +77,14 @@
75 77 try {
76 78 StopWatch stopWatch = new StopWatch("QuanPatientWorker -" + patients.getId());
77 79 QuanPatientsResult quanPatientsResult = new QuanPatientsResult();
78   - /*********************************************************/
  80 + /*******************************开始**************************/
79 81 /**
80 82 * 秦皇岛需求 在区域妇幼管理---全部孕妇管理---全部产妇管理、全部孕妇管理两个界面，首次建档医院后面加初诊日期一栏列表
81 83 */
82 84 if (patients.getFirstCheckTime() != null){
83 85 quanPatientsResult.setFirstCheckTime(DateUtil.getyyyy_MM_dd(patients.getFirstCheckTime()));
84 86 }
85   - /*********************************************************/
  87 + /****************************结束*****************************/
86 88 quanPatientsResult.setVcCardNo(patients.getVcCardNo());
87 89 quanPatientsResult.setCardNo(patients.getCardNo());
88 90 quanPatientsResult.setRemark(patients.getMremark());
... ... @@ -220,9 +222,37 @@
220 222 }
221 223 }
222 224 }
223   -
224   - quanPatientsResult.setcTimes(i + ichu);
225   -
  225 + //统计产检次数
  226 + List <String> patientIds = new ArrayList <>();
  227 + patientIds.add(patients.getId());
  228 + PatientsQuery patientsQuery = new PatientsQuery();
  229 + patientsQuery.setSource(patients.getId());
  230 + patientsQuery.setBuildType(1);
  231 + List <Patients> patients1 = patientsService.queryPatient(patientsQuery);
  232 + if (CollectionUtils.isNotEmpty(patients1)) {
  233 + for (Patients ps : patients1) {
  234 + patientIds.add(ps.getId());
  235 + }
  236 + }
  237 + int chuzhen = 0;
  238 + int fuzhen = 0;
  239 + //初诊记录
  240 + AntExChuQuery antExChuQuery = new AntExChuQuery();
  241 + antExChuQuery.setYn(YnEnums.YES.getId());
  242 + antExChuQuery.setParentIds(patientIds);
  243 + List <AntExChuModel> antExChuModels = antExService.queryAntExChu(antExChuQuery);
  244 + if (CollectionUtils.isNotEmpty(antExChuModels)) {
  245 + chuzhen = antExChuModels.size();
  246 + }
  247 + //复诊记录
  248 + AntExQuery antExQuery1 = new AntExQuery();
  249 + antExQuery1.setYn(YnEnums.YES.getId());
  250 + antExQuery1.setParentIds(patientIds);
  251 + List <AntenatalExaminationModel> list1 = antExService.queryAntenatalExamination(antExQuery1.convertToQuery());
  252 + if (CollectionUtils.isNotEmpty(list1)) {
  253 + fuzhen = list1.size();
  254 + }
  255 + quanPatientsResult.setcTimes(chuzhen + fuzhen);
226 256  
227 257 antExQuery.setHospitalId(hospital);
228 258 //本院初诊