diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/IpUtils.java b/platform-common/src/main/java/com/lyms/platform/common/utils/IpUtils.java index 60a16e8..1e9ae2e 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/IpUtils.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/IpUtils.java @@ -26,5 +26,23 @@ public class IpUtils { public static boolean isWhite(HttpServletRequest request) { return ipSet.contains(request.getRemoteHost()); } - + public static String getIpAddress(HttpServletRequest request) { + String ip = request.getHeader("x-forwarded-for"); + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { + ip = request.getHeader("Proxy-Client-IP"); + } + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { + ip = request.getHeader("WL-Proxy-Client-IP"); + } + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { + ip = request.getHeader("HTTP_CLIENT_IP"); + } + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { + ip = request.getHeader("HTTP_X_FORWARDED_FOR"); + } + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { + ip = request.getRemoteAddr(); + } + return ip; + } } diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyZjkService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyZjkService.java index ed89615..aba17e9 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyZjkService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyZjkService.java @@ -57,25 +57,57 @@ public class LhxfyZjkService { private AntExRecordService recordService; @Autowired private BasicConfigService basicConfigService; + private static final List HOSPITALIDS= new ArrayList<>(); + static { + HOSPITALIDS.add("2100001605"); + HOSPITALIDS.add("2100001653"); + HOSPITALIDS.add("2100001654"); + HOSPITALIDS.add("2100001655"); + HOSPITALIDS.add("2100001656"); + HOSPITALIDS.add("2100001657"); + HOSPITALIDS.add("2100001658"); + HOSPITALIDS.add("2100001659"); + HOSPITALIDS.add("2100001660"); + HOSPITALIDS.add("2100001661"); + HOSPITALIDS.add("2100001662"); + HOSPITALIDS.add("2100001663"); + HOSPITALIDS.add("2100001664"); + HOSPITALIDS.add("2100001665"); + HOSPITALIDS.add("2100001666"); + HOSPITALIDS.add("2100001667"); + HOSPITALIDS.add("2100001669"); + HOSPITALIDS.add("2100001670"); + HOSPITALIDS.add("2100001671"); + HOSPITALIDS.add("2100001672"); + HOSPITALIDS.add("2100001673"); + HOSPITALIDS.add("2100001674"); + HOSPITALIDS.add("2100001675"); + HOSPITALIDS.add("2100001676"); + HOSPITALIDS.add("2100001677"); + + } public void syncLhxfyData() { - String hospitalId = "2100001605"; - String dateStr = DateUtil.getyyyy_MM_dd(new Date()); - Date start = DateUtil.getDayFirstSecond(DateUtil.parseYMD(dateStr)); - Date end = DateUtil.getDayLastSecond(DateUtil.parseYMD(dateStr)); - syncMcChildhealthChildren(hospitalId, start, end); - syncChildhealthNeonate(hospitalId, start, end); - syncMcWomanhealth42days(hospitalId, start, end); - syncMcWomanhealthPostpartum(hospitalId, start, end); - syncMcWomanhealthAntenatal(hospitalId, start, end); - syncEtycf(hospitalId); + syncEtycf(); + for (String hospitalId : HOSPITALIDS) + { + String dateStr = DateUtil.getyyyy_MM_dd(new Date()); + Date start = DateUtil.getDayFirstSecond(DateUtil.parseYMD(dateStr)); + Date end = DateUtil.getDayLastSecond(DateUtil.parseYMD(dateStr)); + syncMcChildhealthChildren(hospitalId, start, end); + syncChildhealthNeonate(hospitalId, start, end); + syncMcWomanhealth42days(hospitalId, start, end); + syncMcWomanhealthPostpartum(hospitalId, start, end); + syncMcWomanhealthAntenatal(hospitalId, start, end); + } + } - public void syncEtycf(String hospitalId) + public void syncEtycf() { EtycfJobModel jobModel = new EtycfJobModel(); - Long babyvisitnum = mongoTemplate.count(new Query(Criteria.where("hospitalId").is(hospitalId).and("yn").ne("0")), NewbornVisit.class); + Long babyvisitnum = mongoTemplate.count(new Query(Criteria.where("hospitalId").in(HOSPITALIDS).and("yn").ne("0")), NewbornVisit.class); jobModel.setBabyvisitnum(String.valueOf(babyvisitnum)); BabyModelQuery babyQuery = new BabyModelQuery(); @@ -85,7 +117,7 @@ public class LhxfyZjkService { babyQuery.setBuildTypeList(buildType); babyQuery.setDataStatus(true);//排除自动建档数据 babyQuery.setYn(YnEnums.YES.getId()); - babyQuery.setHospitalId(hospitalId); + babyQuery.setHospitalIdList(HOSPITALIDS); Long etmanagenum = mongoTemplate.count(babyQuery.convertToQuery().convertToMongoQuery(), BabyModel.class); jobModel.setEtmanagenum(String.valueOf(etmanagenum)); @@ -94,7 +126,7 @@ public class LhxfyZjkService { patientsQuery.setYn(YnEnums.YES.getId()); patientsQuery.setExtEnable(false); patientsQuery.setBuildTypeNot(1); - patientsQuery.setHospitalId(hospitalId); + patientsQuery.setHospitalList(HOSPITALIDS); Long ycfnum = mongoTemplate.count(patientsQuery.convertToQuery().convertToMongoQuery(), Patients.class); @@ -106,17 +138,21 @@ public class LhxfyZjkService { UsersQuery usersQuery = new UsersQuery(); - usersQuery.setOrgId(Integer.parseInt(hospitalId)); - List userses = usersService.queryUsers(usersQuery); - if (!CollectionUtils.isNotEmpty(userses)) - { - return; - } List uids = new ArrayList<>(); - for (Users users1 : userses) + for (String hospitalId : HOSPITALIDS) { - uids.add(users1.getId()+""); + usersQuery.setOrgId(Integer.parseInt(hospitalId)); + List userses = usersService.queryUsers(usersQuery); + if (!CollectionUtils.isNotEmpty(userses)) + { + continue; + } + for (Users users1 : userses) + { + uids.add(users1.getId()+""); + } } + Long postnum = mongoTemplate.count(new Query(Criteria.where("visitDoctor").in(uids)), MatdeliverFollowModel.class); jobModel.setPostnum(String.valueOf(postnum)); jobModel.setHappentime(DateUtil.getyyyy_MM_dd(new Date())); @@ -287,7 +323,7 @@ public class LhxfyZjkService { try{ child.setReport_doctor_gb(usersService.getUsers(Integer.parseInt(checkModel.getCheckDoctor())).getName()); }catch (Exception e){} - child.setInvalid(checkModel.getYn() == 1 ? "否" :"是" ); + child.setInvalid(checkModel.getYn() == 1 ? "0" :"1" ); child.setVisit_date_gb(DateUtil.getyyyy_MM_dd(checkModel.getCheckDate())); child.setNext_visit_date_gb(DateUtil.getyyyy_MM_dd(checkModel.getNextDate())); child.setUpdatetime(DateUtil.getyyyy_MM_dd(checkModel.getModified())); @@ -411,6 +447,7 @@ public class LhxfyZjkService { neonate.setMidwifery_institutions_gb(babyModel.getDeliverOrg()); } neonate.setRegister_status("0"); + neonate.setInvalid("0"); mcChildhealthNeonates.add(neonate); String json = JsonUtil.array2JsonString(mcChildhealthNeonates); @@ -485,7 +522,7 @@ public class LhxfyZjkService { days.setHappentime(DateUtil.getyyyy_MM_dd(post.getCheckTime())); days.setCreatetime(DateUtil.getyyyy_MM_dd(post.getCreated())); days.setRegister_status("0"); - + days.setInvalid("0"); mcWomanhealth42days.add(days); String json = JsonUtil.array2JsonString(mcWomanhealth42days); sendSyncData(json,URL+"lhfy/saveMcWomanhealth42days"); @@ -700,7 +737,7 @@ public class LhxfyZjkService { antenatal.setCreatetime(DateUtil.getyyyy_MM_dd(examinationModel.getCreated())); } } - + antenatal.setInvalid("0"); antenatal.setRegister_status("0"); mcWomanhealthAntenatals.add(antenatal); String json = JsonUtil.array2JsonString(mcWomanhealthAntenatals); @@ -792,6 +829,7 @@ public class LhxfyZjkService { postpartum.setHappentime(DateUtil.getyyyy_MM_dd(followModel.getVisitDate())); postpartum.setCreatetime(DateUtil.getyyyy_MM_dd(followModel.getCreateDate())); postpartum.setRegister_status("0"); + postpartum.setInvalid("0"); mcWomanhealthPostpartums.add(postpartum); String json = JsonUtil.array2JsonString(mcWomanhealthPostpartums); sendSyncData(json,URL+"lhfy/saveMcWomanhealthPostpartum"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BloodPressureController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BloodPressureController.java index 86e1a41..ab48f0c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BloodPressureController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BloodPressureController.java @@ -44,8 +44,9 @@ public class BloodPressureController extends BaseController { @ResponseBody @RequestMapping(method = RequestMethod.GET) @TokenRequired - public BaseResponse list(String key, String vcCardNo, Integer weekStart, Integer weekEnd, Integer age, Integer page, Integer limit, HttpServletRequest request) { - return bloodPressureService.list(key, vcCardNo, weekStart, weekEnd, age, page, limit, getUserId(request)); + public BaseResponse list(String key, String vcCardNo, Integer weekStart, Integer weekEnd, Integer age, + Integer page, Integer limit, HttpServletRequest request,String isAll) { + return bloodPressureService.list(key, vcCardNo, weekStart, weekEnd, age, page, limit, getUserId(request), isAll); } @ResponseBody diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java index e5bf4b1..c4919e8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java @@ -58,9 +58,9 @@ public class PatientWeightController extends BaseController { @ResponseBody @TokenRequired @RequestMapping(value = "/query", method = RequestMethod.GET) - public BaseResponse list(String key, String lastname,String vcCardNo, Integer currentWeekStart, + public BaseResponse list(String isAll,String key, String lastname,String vcCardNo, Integer currentWeekStart, Integer currentWeekEnd, Integer age, Integer page, Integer limit, Integer type, Integer isUp, HttpServletRequest request) { - return patientWeightService.list(key, lastname, vcCardNo, currentWeekStart, currentWeekEnd, age, page, limit, getUserId(request),type,isUp); + return patientWeightService.list(isAll,key, lastname, vcCardNo, currentWeekStart, currentWeekEnd, age, page, limit, getUserId(request),type,isUp); } /** 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 ecc05f2..3cf008f 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 @@ -195,6 +195,35 @@ public class TestController extends BaseController { @Autowired private LhxfyZjkService lhxfyZjkService; + private static final List HOSPITALIDS= new ArrayList<>(); + static { + HOSPITALIDS.add("2100001605"); + HOSPITALIDS.add("2100001653"); + HOSPITALIDS.add("2100001654"); + HOSPITALIDS.add("2100001655"); + HOSPITALIDS.add("2100001656"); + HOSPITALIDS.add("2100001657"); + HOSPITALIDS.add("2100001658"); + HOSPITALIDS.add("2100001659"); + HOSPITALIDS.add("2100001660"); + HOSPITALIDS.add("2100001661"); + HOSPITALIDS.add("2100001662"); + HOSPITALIDS.add("2100001663"); + HOSPITALIDS.add("2100001664"); + HOSPITALIDS.add("2100001665"); + HOSPITALIDS.add("2100001666"); + HOSPITALIDS.add("2100001667"); + HOSPITALIDS.add("2100001669"); + HOSPITALIDS.add("2100001670"); + HOSPITALIDS.add("2100001671"); + HOSPITALIDS.add("2100001672"); + HOSPITALIDS.add("2100001673"); + HOSPITALIDS.add("2100001674"); + HOSPITALIDS.add("2100001675"); + HOSPITALIDS.add("2100001676"); + HOSPITALIDS.add("2100001677"); + + } static Map highRisks = new HashMap<>(); static { @@ -5021,10 +5050,9 @@ public class TestController extends BaseController { @RequestMapping(value = "/syncEtycf", method = RequestMethod.GET) @ResponseBody - public void syncEtycf(@RequestParam(required = false) String hospitalId - ) { + public void syncEtycf() { - lhxfyZjkService.syncEtycf(hospitalId); + lhxfyZjkService.syncEtycf(); } @@ -5084,21 +5112,25 @@ public class TestController extends BaseController { @RequestMapping(value = "/syncLhfyzjkAll", method = RequestMethod.GET) @ResponseBody - public void syncLhfyzjkAll(@RequestParam(required = false) String hospitalId, + public void syncLhfyzjkAll( @RequestParam(required = false) String startStr) { - lhxfyZjkService.syncEtycf(hospitalId); + lhxfyZjkService.syncEtycf(); Date start = DateUtil.parseYMDHMS(startStr); for (int i = 1 ; i <= 7 ; i++) { Date end = DateUtil.addYear(start,1); - lhxfyZjkService.syncMcChildhealthChildren(hospitalId, start, end); - lhxfyZjkService.syncChildhealthNeonate(hospitalId, start, end); - lhxfyZjkService.syncMcWomanhealth42days(hospitalId, start, end); - lhxfyZjkService.syncMcWomanhealthPostpartum(hospitalId, start, end); - lhxfyZjkService.syncMcWomanhealthAntenatal(hospitalId, start, end); + for (String hospitalId : HOSPITALIDS) + { + lhxfyZjkService.syncMcChildhealthChildren(hospitalId,start, end); + lhxfyZjkService.syncChildhealthNeonate(hospitalId,start, end); + lhxfyZjkService.syncMcWomanhealth42days(hospitalId, start, end); + lhxfyZjkService.syncMcWomanhealthPostpartum(hospitalId, start, end); + lhxfyZjkService.syncMcWomanhealthAntenatal( hospitalId,start, end); + } start = end; } } + } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java index cdf226c..e9f878b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java @@ -445,7 +445,8 @@ public class UsersController extends BaseController { public void usersLogin(@RequestParam(value = "account") String account, @RequestParam(value = "vercode", required = false) String code, @RequestParam(value = "password", required = false) String password, - HttpServletResponse response) { + HttpServletResponse response, + HttpServletRequest request) { Map resultMsgMap = new HashMap<>(); if (StringUtils.isEmpty(account) && (StringUtils.isEmpty(code) || StringUtils.isEmpty(password))) { resultMsgMap.put(ResultUtils.ERROR_CODE, ConstantInterface.PARAMETER_ERROR);//参数错误 @@ -482,6 +483,13 @@ public class UsersController extends BaseController { // return; // } + String ip = IpUtils.getIpAddress(request); + System.out.println("userIp="+ip); +// if ("2100001452".equals(u.getOrgId().toString()) && "192.168.100.101".equals(ip)) { +// ResultUtils.buildParameterErrorResultAndWrite(response, ""); +// return; +// } + if (null != u.getOrgId()) { Organization organization = organizationService.getOrganization(u.getOrgId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IBloodPressureService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IBloodPressureService.java index 45b60f5..feaf086 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IBloodPressureService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IBloodPressureService.java @@ -11,7 +11,8 @@ public interface IBloodPressureService extends IBaseService { BaseResponse addOrUpdate(Integer userId, BloodPressure bloodPressure); - BaseResponse list(String key, String vcCardNo, Integer weekStart, Integer weekEnd, Integer age, Integer page, Integer limit, Integer userId); + BaseResponse list(String key, String vcCardNo, Integer weekStart, + Integer weekEnd, Integer age, Integer page, Integer limit, Integer userId,String type); BaseResponse info(String id, Date startDate); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/PatientWeightService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/PatientWeightService.java index 783fb6e..4b577d6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/PatientWeightService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/PatientWeightService.java @@ -28,7 +28,7 @@ public interface PatientWeightService extends IBaseService { BaseResponse addOrUpdate(Integer userId, PatientWeight patientWeight); - BaseResponse list(String key,String lastname, String vcCardNo, Integer currentWeekStart, Integer currentWeekEnd, Integer age, Integer page, Integer limit, Integer userId,Integer type, Integer isUp); + BaseResponse list(String isAll,String key,String lastname, String vcCardNo, Integer currentWeekStart, Integer currentWeekEnd, Integer age, Integer page, Integer limit, Integer userId,Integer type, Integer isUp); BaseResponse info(String id); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java index a0d05cd..52bf296 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java @@ -212,12 +212,22 @@ public class BloodPressureServiceImpl extends BaseServiceImpl implements IBloodP } @Override - public BaseResponse list(String key, String vcCardNo, Integer weekStart, Integer weekEnd, Integer age, Integer page, Integer limit, Integer userId) { + public BaseResponse list(String key, String vcCardNo, Integer weekStart, Integer + weekEnd, Integer age, Integer page, Integer limit, Integer userId,String isAll) { boolean flag = false; -// List hospitalIds = accessPermissionFacade.getCurrentUserHospPermissions(userId); - List hospitalIds = groupsFacade.findGroupHospital(userId, false); - Criteria criteria = Criteria.where("yn").is(1).and("hospitalId").in(hospitalIds); + List hids = new ArrayList<>(); + if (!StringUtils.isNotEmpty(isAll) || "1".equals(isAll)) + { + String hospitalId = autoMatchFacade.getHospitalId(userId); + hids.add(hospitalId); + } + else + { + hids.addAll(hospitalIds); + } + + Criteria criteria = Criteria.where("yn").is(1).and("hospitalId").in(hids); Criteria pCriteria = Criteria.where("yn").is(1).and("hospitalId").in(hospitalIds); if (StringUtils.isNotEmpty(key)) { flag = true; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java index 31d5d6d..96536fc 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java @@ -493,11 +493,21 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient @Override - public BaseResponse list(String key, String lastname,String vcCardNo, Integer currentWeekStart, Integer currentWeekEnd, + public BaseResponse list(String isAll,String key, String lastname,String vcCardNo, Integer currentWeekStart, Integer currentWeekEnd, Integer age, Integer page, Integer limit, Integer userId,Integer type, Integer isUp) { boolean flag = false; List hospital = groupsFacade.findGroupHospital(userId, false); - Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital); + List hids = new ArrayList<>(); + if (!com.lyms.platform.common.utils.StringUtils.isNotEmpty(isAll) || "1".equals(isAll)) + { + String hospitalId = autoMatchFacade.getHospitalId(userId); + hids.add(hospitalId); + } + else + { + hids.addAll(hospital); + } + Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").in(hids); Criteria pCriteria = Criteria.where("yn").is(1).and("hospitalId").in(hospital); if (StringUtils.isNotBlank(key)) { pCriteria.orOperator(Criteria.where("phone").regex(key), Criteria.where("username").regex(key), Criteria.where("cardNo").is(key));