jiangjiazhi / regional-platform

Download as
Browse Code »

Commit d2a61ff025635c055c392ac43e5584877c248e8f

Authored by jesse.wang
1 parent c14b4a4867
Exists in master and in 3 other branches dev, fengning2023-06-06, luanping

4.18

Showing 3 changed files with 26 additions and 14 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ d2a61ff
... ... @@ -23,9 +23,11 @@
23 23 import com.lyms.platform.operate.web.request.*;
24 24 import com.lyms.platform.operate.web.result.*;
25 25 import com.lyms.platform.operate.web.service.ITrackDownService;
26   -import com.lyms.platform.operate.web.service.TeamService;
27 26 import com.lyms.platform.operate.web.utils.*;
28   -import com.lyms.platform.permission.model.*;
  27 +import com.lyms.platform.permission.model.Organization;
  28 +import com.lyms.platform.permission.model.PatientService;
  29 +import com.lyms.platform.permission.model.PatientServiceQuery;
  30 +import com.lyms.platform.permission.model.Users;
29 31 import com.lyms.platform.permission.service.CouponService;
30 32 import com.lyms.platform.permission.service.OrganizationService;
31 33 import com.lyms.platform.permission.service.PatientServiceService;
... ... @@ -1933,9 +1935,9 @@
1933 1935 patientsQuery.setBuildType(1);
1934 1936 patientsQuery.setSort("created");
1935 1937 //在区域组的时候不用查询隐藏档案，但是这里看不见转诊过来的数据
1936   - if (null != groupsFacade.findByCurrentUserId(autoMatchFacade.getHospitalId(userId))) {
1937   - patientsQuery.setExtEnable(false);
1938   - }
  1938 +// if (null != groupsFacade.findByCurrentUserId(autoMatchFacade.getHospitalId(userId))) {
  1939 +// patientsQuery.setExtEnable(false);
  1940 +// }
1939 1941 System.out.println("查询孕妇档案：" + patientsQuery.convertToQuery().convertToMongoQuery());
1940 1942 //获取所有的建档记录
1941 1943 List <Patients> list = patientsService.queryPatient(patientsQuery);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java View file @ d2a61ff
... ... @@ -5440,8 +5440,7 @@
5440 5440 if(CollectionUtils.isNotEmpty(patientpIds)){
5441 5441 query.setPersonIds(patientpIds);
5442 5442 }
5443   - //分页数据
5444   - query.mysqlBuild(couponMapper.bookbuildingCouponCount(query));
  5443 + int sum = couponMapper.bookbuildingCouponCount(query);
5445 5444 //查询mysql 优惠券记录
5446 5445 List<Map> bookbuildingCouponList=couponMapper.bookbuildingCoupon(query);
5447 5446  
... ... @@ -5456,6 +5455,7 @@
5456 5455 }
5457 5456 List<Patients> patients =patientsService.queryPatient(patientsQuery2);
5458 5457 if(CollectionUtils.isEmpty(patients)){
  5458 + sum=sum-1;
5459 5459 continue;
5460 5460 }
5461 5461 Patients patientsModel=patients.get(0);
5462 5462  
5463 5463  
... ... @@ -5465,11 +5465,25 @@
5465 5465 String address=CommonsHelper.getResidence(patientsModel.getProvinceRegisterId(), patientsModel.getCityRegisterId(), patientsModel.getAreaRegisterId(), patientsModel.getStreetRegisterId(),patientsModel.getVillageRegister() + patientsModel.getAddressRegister(), basicConfigService);
5466 5466 map.put("address", address);
5467 5467 map.put("hospitalName", bookbuildingCoupon.get("hospitalname"));
5468   - String yyzyfmHospitalId_name = couponMapper.findHospitalNameById(patientsModel.getYyzyfmHospitalId());
  5468 + String yyzyfmHospitalId_name = "";
  5469 + for (Patients patient : patients) {
  5470 + if (StringUtils.isNotEmpty(patient.getYyzyfmHospitalId())) {
  5471 + yyzyfmHospitalId_name = couponMapper.findHospitalNameById(patientsModel.getYyzyfmHospitalId());
  5472 +
  5473 + map.put("yyzyfmHospitalId", StringUtils.isNotEmpty(yyzyfmHospitalId_name)?yyzyfmHospitalId_name:"");
  5474 + } else {
  5475 + map.put("yyzyfmHospitalId","");
  5476 + }
  5477 + }
5469 5478 if (StringUtils.isNotEmpty(yyzyfmHospitalId_name)&&yyzyfmHospitalId_name.equals("秦皇岛军工医院")) {
  5479 + sum=sum-1;
5470 5480 continue;
5471 5481 }
5472   - map.put("yyzyfmHospitalId", StringUtils.isNotEmpty(yyzyfmHospitalId_name)?yyzyfmHospitalId_name:"");
  5482 +// String yyzyfmHospitalId_name = couponMapper.findHospitalNameById(patientsModel.getYyzyfmHospitalId());
  5483 +// if (StringUtils.isNotEmpty(yyzyfmHospitalId_name)&&yyzyfmHospitalId_name.equals("秦皇岛军工医院")) {
  5484 +// continue;
  5485 +// }
  5486 +// map.put("yyzyfmHospitalId", StringUtils.isNotEmpty(yyzyfmHospitalId_name)?yyzyfmHospitalId_name:"");
5473 5487 //初诊医院
5474 5488 String firstVisitHospital="";
5475 5489 AntExChuQuery antExChuQuery = new AntExChuQuery();
... ... @@ -5489,7 +5503,7 @@
5489 5503  
5490 5504 result.add(map);
5491 5505 }
5492   -
  5506 + query.mysqlBuild(sum);
5493 5507 objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
5494 5508 objectResponse.setErrormsg("成功");
5495 5509 objectResponse.setData(result);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanPatientWorker.java View file @ d2a61ff
... ... @@ -10,7 +10,6 @@
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;
14 13 import com.lyms.platform.operate.web.result.HighScoreResult;
15 14 import com.lyms.platform.operate.web.result.QuanPatientsResult;
16 15 import com.lyms.platform.operate.web.utils.CommonsHelper;
... ... @@ -185,9 +184,6 @@
185 184 }
186 185 }
187 186 }
188   -
189   - //系统初诊次数
190   - int ichu = CollectionUtils.isEmpty(chu) ? 0 : chu.size();
191 187  
192 188 //系统复诊次数
193 189 int i = 0;