diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PostReviewModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PostReviewModel.java index 8339472..0b29163 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/PostReviewModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PostReviewModel.java @@ -209,6 +209,25 @@ public class PostReviewModel extends BaseModel { private String cityId; private String areaId; private String streetId; + private String address; + + /** + * 产后休养地 + */ + private String addressPostRest; + private String provincePostRestId; + private String cityPostRestId; + private String areaPostRestId; + private String streetPostRestId; + + /** + * 孕妇户籍地址 + */ + private String addressRegister; + private String provinceRegisterId; + private String cityRegisterId; + private String areaRegisterId; + private String streetRegisterId; //出院时间 private Date outDate; @@ -220,6 +239,94 @@ public class PostReviewModel extends BaseModel { //温度 private String temperature; + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + public String getAddressPostRest() { + return addressPostRest; + } + + public void setAddressPostRest(String addressPostRest) { + this.addressPostRest = addressPostRest; + } + + public String getProvincePostRestId() { + return provincePostRestId; + } + + public void setProvincePostRestId(String provincePostRestId) { + this.provincePostRestId = provincePostRestId; + } + + public String getCityPostRestId() { + return cityPostRestId; + } + + public void setCityPostRestId(String cityPostRestId) { + this.cityPostRestId = cityPostRestId; + } + + public String getAreaPostRestId() { + return areaPostRestId; + } + + public void setAreaPostRestId(String areaPostRestId) { + this.areaPostRestId = areaPostRestId; + } + + public String getStreetPostRestId() { + return streetPostRestId; + } + + public void setStreetPostRestId(String streetPostRestId) { + this.streetPostRestId = streetPostRestId; + } + + public String getAddressRegister() { + return addressRegister; + } + + public void setAddressRegister(String addressRegister) { + this.addressRegister = addressRegister; + } + + public String getProvinceRegisterId() { + return provinceRegisterId; + } + + public void setProvinceRegisterId(String provinceRegisterId) { + this.provinceRegisterId = provinceRegisterId; + } + + public String getCityRegisterId() { + return cityRegisterId; + } + + public void setCityRegisterId(String cityRegisterId) { + this.cityRegisterId = cityRegisterId; + } + + public String getAreaRegisterId() { + return areaRegisterId; + } + + public void setAreaRegisterId(String areaRegisterId) { + this.areaRegisterId = areaRegisterId; + } + + public String getStreetRegisterId() { + return streetRegisterId; + } + + public void setStreetRegisterId(String streetRegisterId) { + this.streetRegisterId = streetRegisterId; + } + public String getTemperature() { return temperature; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostReviewController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostReviewController.java index 8e26957..0bd3dbd 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostReviewController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostReviewController.java @@ -148,8 +148,42 @@ public class PostReviewController extends BaseController { @ResponseBody public BaseObjectResponse postpartumReview(Date startDate, Date endDate, String doctorId, Integer startDay, Integer endDay, String zyList, String jcxList, String gcDoctorId, - String key, Integer page, Integer limit, HttpServletRequest request) { - return postReviewService.postpartumReview(getUserId(request), startDate, endDate, doctorId, key, page, limit, startDay, endDay, zyList, jcxList,gcDoctorId); + String key, Integer page, Integer limit, HttpServletRequest request, + String hospitalId, + String area, + //产后修改修养地 + String provincePostRestId, + String cityPostRestId, + String areaPostRestId, + String streetPostRestId, + //户籍地址 + String provinceRegisterId, + String cityRegisterId, + String areaRegisterId, + String streetRegisterId, + //家庭地址 + String provinceId, + String cityId, + String areaId, + String streetId + ) { + return postReviewService.postpartumReview(getUserId(request), startDate, endDate, doctorId, key, page, limit, startDay, + endDay, zyList, jcxList,gcDoctorId, + hospitalId, + area, + provincePostRestId, + cityPostRestId, + areaPostRestId, + streetPostRestId, + provinceRegisterId, + cityRegisterId, + areaRegisterId, + streetRegisterId, + provinceId, + cityId, + areaId, + streetId + ); } /** @@ -165,7 +199,8 @@ public class PostReviewController extends BaseController { public void postpartumReviewExport(Date startDate, Date endDate, String doctorId, Integer startDay, Integer endDay, String key, HttpServletRequest request, HttpServletResponse response) { - postReviewService.postpartumReviewExport(getUserId(request), startDate, endDate, doctorId, key, response,startDay, endDay); + postReviewService.postpartumReviewExport(getUserId(request), startDate, endDate, doctorId, key, + response,startDay, endDay); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java index dc9fd4c..0b56536 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java @@ -6598,6 +6598,20 @@ public class TestController extends BaseController { postReviewModel.setCityId(patients.getCityRegisterId()); postReviewModel.setAreaId(patients.getAreaRegisterId()); postReviewModel.setStreetId(patients.getStreetRegisterId()); + postReviewModel.setAddress(patients.getAddressRegister()); + + postReviewModel.setProvincePostRestId(patients.getProvincePostRestId()); + postReviewModel.setCityPostRestId(patients.getCityPostRestId()); + postReviewModel.setAreaPostRestId(patients.getAreaPostRestId()); + postReviewModel.setStreetPostRestId(patients.getStreetPostRestId()); + postReviewModel.setAddressPostRest(patients.getAddressPostRest()); + + + postReviewModel.setProvinceRegisterId(patients.getProvinceId()); + postReviewModel.setCityRegisterId(patients.getCityId()); + postReviewModel.setAreaRegisterId(patients.getAreaId()); + postReviewModel.setStreetRegisterId(patients.getStreetId()); + postReviewModel.setAddressRegister(patients.getAddress()); System.out.println("产后访视同步居住地址："+postReviewModel.getId()); Update update = MongoConvertHelper .convertToNativeUpdate(ReflectionUtils.getUpdateField(postReviewModel)); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java index 50de405..ad4c6f3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java @@ -3909,24 +3909,27 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { hospitalDate.put("data18",data17_data2+"%"); - //产后访视人数 - int data19= (int)mongoTemplate.count(new Query(Criteria. - where("streetId").in(streetIds).and("checkTime").lte(endDate).gte(startDateFirst).and("yn").is(1)),PostReviewModel.class); - System.out.println("===12"+new Query(Criteria. - where("streetId").in(streetIds).and("checkTime").lte(endDate).gt(startDateFirst).and("yn").is(1)).toString()); - int lastDate19= null==hospitalDate.get("data19")?0:Integer.parseInt(hospitalDate.get("data19").toString()); - hospitalDate.put("data19",data19+lastDate19); - //产后访视率% - String data19_data2="0.00"; - if(Integer.parseInt(hospitalDate.get("data2").toString())!=0){ - float v = (float) Integer.parseInt(hospitalDate.get("data19").toString()) / Integer.parseInt(hospitalDate.get("data2").toString()); - if(v>=1){ - data19_data2="100.00"; - }else { - data19_data2 = df.format(v * 100); - } - } - hospitalDate.put("data20",data19_data2+"%"); +// //产后访视人数 +// int data19= (int)mongoTemplate.count(new Query(Criteria. +// where("streetId").in(streetIds).and("checkTime").lte(endDate).gte(startDateFirst).and("yn").is(1)),PostReviewModel.class); +// System.out.println("===12"+new Query(Criteria. +// where("streetId").in(streetIds).and("checkTime").lte(endDate).gt(startDateFirst).and("yn").is(1)).toString()); +// int lastDate19= null==hospitalDate.get("data19")?0:Integer.parseInt(hospitalDate.get("data19").toString()); +// hospitalDate.put("data19",data19+lastDate19); +// //产后访视率% +// String data19_data2="0.00"; +// if(Integer.parseInt(hospitalDate.get("data2").toString())!=0){ +// float v = (float) Integer.parseInt(hospitalDate.get("data19").toString()) / Integer.parseInt(hospitalDate.get("data2").toString()); +// if(v>=1){ +// data19_data2="100.00"; +// }else { +// data19_data2 = df.format(v * 100); +// } +// } +// hospitalDate.put("data20",data19_data2+"%"); + + hospitalDate.put("data19",0); + hospitalDate.put("data20","0%"); PatientsQuery patientsQuery1 = new PatientsQuery(); patientsQuery1.setStreetRegisterIds(streetIds); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IPostReviewService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IPostReviewService.java index 4d077df..2500247 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IPostReviewService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IPostReviewService.java @@ -10,7 +10,26 @@ import java.util.Date; */ public interface IPostReviewService extends IBaseService { // BaseObjectResponse postpartumReview(Integer userId, Date startDate, Date endDate, String doctorId, String key, Integer page, Integer limit,Integer startDay, Integer endDay); - BaseObjectResponse postpartumReview(Integer userId, Date startDate, Date endDate, String doctorId, String key, Integer page, Integer limit, Integer startDay, Integer endDay, String zyList, String jcxList,String gcDoctorId); + BaseObjectResponse postpartumReview(Integer userId, Date startDate, Date endDate, String doctorId, String key, + Integer page, Integer limit, Integer startDay, Integer endDay, String zyList, + String jcxList,String gcDoctorId, + String hospitalId, + String area, + //产后修改修养地 + String provincePostRestId, + String cityPostRestId, + String areaPostRestId, + String streetPostRestId, + //户籍地址 + String provinceRegisterId, + String cityRegisterId, + String areaRegisterId, + String streetRegisterId, + //家庭地址 + String provinceId, + String cityId, + String areaId, + String streetId); void postpartumReviewExport(Integer userId, Date startDate, Date endDate, String doctorId, String key, HttpServletResponse response,Integer startDay, Integer endDay); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PostReviewServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PostReviewServiceImpl.java index 06b8e7e..bf61774 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PostReviewServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PostReviewServiceImpl.java @@ -13,7 +13,11 @@ import com.lyms.platform.operate.web.utils.CommonsHelper; import com.lyms.platform.operate.web.utils.MongoUtil; import com.lyms.platform.operate.web.utils.ResponseUtil; import com.lyms.platform.permission.dao.master.MasterUsersMapper; +import com.lyms.platform.permission.model.Organization; +import com.lyms.platform.permission.model.OrganizationQuery; import com.lyms.platform.permission.model.Users; +import com.lyms.platform.permission.service.OrganizationService; +import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.Patients; import com.lyms.platform.pojo.PostReviewModel; import org.apache.commons.collections.CollectionUtils; @@ -38,7 +42,10 @@ public class PostReviewServiceImpl extends BaseServiceImpl implements IPostRevie @Autowired private AutoMatchFacade autoMatchFacade; - + @Autowired + private OrganizationService organizationService; + @Autowired + private UsersService usersService; @Autowired private MasterUsersMapper usersMapper; @@ -52,12 +59,111 @@ public class PostReviewServiceImpl extends BaseServiceImpl implements IPostRevie @Override public BaseObjectResponse postpartumReview(Integer userId, Date startDate, Date endDate, String doctorId, String key, Integer page, - Integer limit,Integer startDay, Integer endDay,String zyList,String jcxList,String gcDoctorId) { + Integer limit,Integer startDay, Integer endDay,String zyList,String jcxList,String gcDoctorId, + String hid, + String area, + //产后修改修养地 + String provincePostRestId, + String cityPostRestId, + String areaPostRestId, + String streetPostRestId, + //户籍地址 + String provinceRegisterId, + String cityRegisterId, + String areaRegisterId, + String streetRegisterId, + //家庭地址 + String provinceId, + String cityId, + String areaId, + String streetId + ) { + + String hospitalId = autoMatchFacade.getHospitalId(userId); - Query query = Query.query(Criteria.where("hospitalId").is(hospitalId).and("yn").ne(0)); + List hids = new LinkedList<>(); + hids.add(hospitalId); + if (StringUtils.isNotEmpty(area)) + { + if (StringUtils.isNotEmpty(hid)) + { + hids.remove(hospitalId); + hids.add(hid); + } + else + { + Organization users = organizationService.getOrganization(Integer.parseInt(hospitalId)); + OrganizationQuery query = new OrganizationQuery(); + query.setYn(YnEnums.YES.getId()); + query.setAreaId(users.getAreaId()); + query.setCityId(users.getCityId()); + query.setProvinceId(users.getProvinceId()); + List organizations = organizationService.queryHospitalIds(query); + + for(Organization org : organizations) + { + hids.add(org.getId()+""); + } + } + } + + Query query = Query.query(Criteria.where("hospitalId").in(hids).and("yn").ne(0)); + + //户籍地址 + if (StringUtils.isNotEmpty(provinceRegisterId)) + { + query.addCriteria(Criteria.where("provinceRegisterId").is(provinceRegisterId)); + if (StringUtils.isNotEmpty(cityRegisterId)) + { + query.addCriteria(Criteria.where("cityRegisterId").is(cityRegisterId)); + if (StringUtils.isNotEmpty(areaRegisterId)) + { + query.addCriteria(Criteria.where("areaRegisterId").is(areaRegisterId)); + if (StringUtils.isNotEmpty(streetRegisterId)) + { + query.addCriteria(Criteria.where("streetRegisterId").is(streetRegisterId)); + } + } + } + } + //家庭地址 + if (StringUtils.isNotEmpty(provinceId)) + { + query.addCriteria(Criteria.where("provinceId").is(provinceId)); + if (StringUtils.isNotEmpty(provinceId)) + { + query.addCriteria(Criteria.where("cityId").is(cityId)); + if (StringUtils.isNotEmpty(cityId)) + { + query.addCriteria(Criteria.where("areaId").is(areaId)); + if (StringUtils.isNotEmpty(areaId)) + { + query.addCriteria(Criteria.where("streetId").is(streetId)); + } + } + } + } + + //产后修改修养地 + if (StringUtils.isNotEmpty(provincePostRestId)) + { + query.addCriteria(Criteria.where("provincePostRestId").is(provincePostRestId)); + if (StringUtils.isNotEmpty(cityPostRestId)) + { + query.addCriteria(Criteria.where("cityPostRestId").is(cityPostRestId)); + if (StringUtils.isNotEmpty(areaPostRestId)) + { + query.addCriteria(Criteria.where("areaPostRestId").is(areaPostRestId)); + if (StringUtils.isNotEmpty(streetPostRestId)) + { + query.addCriteria(Criteria.where("streetPostRestId").is(streetPostRestId)); + } + } + } + } if(StringUtils.isNotEmpty(zyList)){ List zyLists = StringUtils.covertToList(zyList, String.class); for (int i = 0; i > datas = (List>) pageResult.getGrid(); Map cnames = new LinkedHashMap<>();