From cbfde61ef95089c3691546d4dcd3c75a0f557317 Mon Sep 17 00:00:00 2001 From: zhangchao Date: Wed, 5 Jun 2024 14:40:56 +0800 Subject: [PATCH] =?UTF-8?q?#fix:=E5=A4=A7=E5=90=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=9C=AC=E9=99=A2=E4=B8=93=E5=B1=9E=E7=AE=A1=E7=90=86=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/lyms/platform/pojo/ArchiveData.java | 11 +++++++++++ .../src/main/java/com/lyms/platform/pojo/Patients.java | 11 +++++++++++ .../main/java/com/lyms/platform/query/PatientsQuery.java | 15 +++++++++++++++ .../operate/web/controller/PostReviewController.java | 10 ++++++---- .../operate/web/controller/QuestionnaireController.java | 8 ++++++++ .../platform/operate/web/controller/RemoteController.java | 4 ++++ .../platform/operate/web/facade/AntExRecordFacade.java | 7 ++++--- .../platform/operate/web/facade/BookbuildingFacade.java | 1 + .../platform/operate/web/facade/MatDeliverFacade.java | 1 + .../lyms/platform/operate/web/facade/PatientFacade.java | 1 + .../operate/web/request/AntExManagerQueryRequest.java | 10 ++++++++++ .../operate/web/request/ChildbirthManagerRequest.java | 10 ++++++++++ .../operate/web/request/PatientManagerRequest.java | 10 ++++++++++ .../operate/web/request/YunBookbuildingAddRequest.java | 9 +++++++++ .../operate/web/result/PatientManagerQueryModel.java | 2 ++ .../platform/operate/web/service/IPostReviewService.java | 5 +++-- .../operate/web/service/impl/PostReviewServiceImpl.java | 12 ++++++++---- 17 files changed, 114 insertions(+), 13 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/ArchiveData.java b/platform-dal/src/main/java/com/lyms/platform/pojo/ArchiveData.java index 650a23b..a7a4f3e 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/ArchiveData.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/ArchiveData.java @@ -22,10 +22,21 @@ public class ArchiveData extends BaseModel { private String jsonData; private Date created; private String assistUserId; + //大同本院职工 0为否 1为是 + private Integer userType; //建档成功时间 private Date buildDate; + + public Integer getUserType() { + return userType; + } + + public void setUserType(Integer userType) { + this.userType = userType; + } + public Date getBuildDate() { return buildDate; } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java index a06f00f..b635791 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java @@ -514,6 +514,17 @@ public class Patients extends BaseModel { private String HIVJ;//人类免疫缺陷病毒抗体 private String tp;//梅毒螺旋体抗体 + //大同职工 1为是 0为否 + private Integer userType; + + public Integer getUserType() { + return userType; + } + + public void setUserType(Integer userType) { + this.userType = userType; + } + public String getHBcAbJ() { return HBcAbJ; } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java index ad1e1ad..dd184c9 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java @@ -439,6 +439,17 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { private String nebookbuildingDoctor; private Map mapTime; + //大同院内职工 1为是 0为否 + private Integer userType; + + + public Integer getUserType() { + return userType; + } + + public void setUserType(Integer userType) { + this.userType = userType; + } public String getNebookbuildingDoctor() { return nebookbuildingDoctor; @@ -1254,6 +1265,10 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { condition = condition.and("enable", notEnable, MongoOper.NE); } + if (userType!=null){ + condition = condition.and("userType", userType, MongoOper.IS); + } + if (null != orServiceStatus && orServiceStatus.length > 1) { condition = condition.and("serviceStatus", Arrays.asList(orServiceStatus), MongoOper.IN); } 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 d049a16..b0e453e 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 @@ -165,7 +165,8 @@ public class PostReviewController extends BaseController { String provinceId, String cityId, String areaId, - String streetId + String streetId, + Integer userType ) { return postReviewService.postpartumReview(getUserId(request), startDate, endDate, doctorId, key, page, limit, startDay, endDay, zyList, jcxList,gcDoctorId, @@ -182,7 +183,8 @@ public class PostReviewController extends BaseController { provinceId, cityId, areaId, - streetId + streetId, + userType ); } @@ -197,10 +199,10 @@ public class PostReviewController extends BaseController { @RequestMapping(method = RequestMethod.GET, value = "/postpartum/review/export") @TokenRequired public void postpartumReviewExport(Date startDate, Date endDate, String doctorId, - Integer startDay, Integer endDay, + Integer startDay, Integer endDay,Integer userType, String key, HttpServletRequest request, HttpServletResponse response) { postReviewService.postpartumReviewExport(getUserId(request), startDate, endDate, doctorId, key, - response,startDay, endDay); + response,startDay, endDay,userType); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/QuestionnaireController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/QuestionnaireController.java index 78def31..82def39 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/QuestionnaireController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/QuestionnaireController.java @@ -67,4 +67,12 @@ public class QuestionnaireController { questionnaireFacade.update(questionnaireEntity); ResultUtils.buildSuccessResultAndWrite(response); } + + @RequestMapping(method = RequestMethod.GET, value = "/questionnaire") + public void getListPc(HttpServletResponse response){ + QuestionnaireQuery questionnaireQuery=new QuestionnaireQuery(); + questionnaireQuery.setStatus(1); + List list= questionnaireFacade.getList(questionnaireQuery); + ResultUtils.buildSuccessResultAndWrite(response,list); + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java index 3fef219..f32764c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java @@ -282,6 +282,7 @@ public class RemoteController extends BaseController { String name, String cardNum, String phone, + @RequestParam(required = false)String userType, @RequestParam(required = false)String assistUserId) { try { ArchiveData data = new ArchiveData(); @@ -291,6 +292,9 @@ public class RemoteController extends BaseController { data.setName(name); data.setCardNum(cardNum); data.setPhone(phone); + if (StringUtils.isNotEmpty(userType)){ + data.setUserType(Integer.valueOf(userType)); + } data.setJsonData(jsonData); data.setCreated(new Date()); data.setAssistUserId(assistUserId); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java index faacdd2..9a08629 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java @@ -410,11 +410,12 @@ public class AntExRecordFacade { public BaseResponse findList(AntExManagerQueryRequest antExManagerQueryRequest, Integer userId, boolean isRegion, String isPage, boolean isCurrent) { String hospitalId = autoMatchFacade.getHospitalId(userId); PatientsQuery patientsQuery = new PatientsQuery(); List patientses = null; - if (StringUtils.isNotEmpty(antExManagerQueryRequest.getQueryNo()) || StringUtils.isNotEmpty(antExManagerQueryRequest.getHighRiskFileCode())) { + if (StringUtils.isNotEmpty(antExManagerQueryRequest.getQueryNo()) || StringUtils.isNotEmpty(antExManagerQueryRequest.getHighRiskFileCode()) || (antExManagerQueryRequest.getUserType()!=null&&antExManagerQueryRequest.getUserType()==1)) { patientsQuery.setQueryNo(antExManagerQueryRequest.getQueryNo()); patientsQuery.setHighRiskFileCode(antExManagerQueryRequest.getHighRiskFileCode()); - System.out.println(patientsQuery.convertToQuery().convertToMongoQuery().toString()); + patientsQuery.setUserType(antExManagerQueryRequest.getUserType()); + // System.out.println(patientsQuery.convertToQuery().convertToMongoQuery().toString()); patientses = patientsService.queryPatient1(patientsQuery, "modpatientsQueryified"); if (CollectionUtils.isEmpty(patientses)) { @@ -444,7 +445,7 @@ public class AntExRecordFacade { parentIds.add(pa.getId()); } antExRecordQuery.setParentIds(parentIds); - } else if (StringUtils.isNotEmpty(antExManagerQueryRequest.getQueryNo()) || StringUtils.isNotEmpty(antExManagerQueryRequest.getHighRiskFileCode())) { + } else if (StringUtils.isNotEmpty(antExManagerQueryRequest.getQueryNo()) || StringUtils.isNotEmpty(antExManagerQueryRequest.getHighRiskFileCode()) || (antExManagerQueryRequest.getUserType()!=null&&antExManagerQueryRequest.getUserType()==1)) { return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(antExRecordQuery.getPageInfo()); } String hospital = autoMatchFacade.getHospitalId(userId); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index 4869e51..e29ec15 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -2584,6 +2584,7 @@ public class BookbuildingFacade { patient.setBuildingManualCode(yunRequest.getBuildingManualCode()); patient.setLastCheckEmployeeId(yunRequest.getLastCheckEmployeeId()); patient.setHighRiskFileCode(yunRequest.getHighRiskFileCode()); + patient.setUserType(yunRequest.getUserType()); return patient; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index afa9c44..a0538ff 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -2612,6 +2612,7 @@ public class MatDeliverFacade { patientsQuery.setIsAutoFm(YnEnums.NO.getId()); patientsQuery.setType(3); patientsQuery.setHighRiskFileCode(childbirthManagerRequest.getHighRiskFileCode()); + patientsQuery.setUserType(childbirthManagerRequest.getUserType()); // 构造医院id集合 List hospitalList = new ArrayList<>(); if (StringUtils.isEmpty(childbirthManagerRequest.getIsArea())) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 3eae3b6..6cd5bb6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -3208,6 +3208,7 @@ public class PatientFacade extends BaseServiceImpl { }*/ patientsQuery.setYn(YnEnums.YES.getId()); + patientsQuery.setUserType(patientManagerRequest.getUserType()); if (!patientManagerRequest.isExcel()) { patientsQuery.setNeed("need"); patientsQuery.setLimit(patientManagerRequest.getLimit()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java index 4fe4c20..e27ab91 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java @@ -139,6 +139,16 @@ public class AntExManagerQueryRequest extends BasePageQueryRequest { // 大同高危专号查询 private String highRiskFileCode; + private Integer userType; + + public Integer getUserType() { + return userType; + } + + public void setUserType(Integer userType) { + this.userType = userType; + } + public String getVillageRegisterId() { return villageRegisterId; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java index 89575c8..20cfbf18 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java @@ -156,6 +156,16 @@ public class ChildbirthManagerRequest extends BasePageQueryRequest { //大同 高危专号 private String highRiskFileCode; + //大同职工 1为是 0为否 + private Integer userType; + + public Integer getUserType() { + return userType; + } + + public void setUserType(Integer userType) { + this.userType = userType; + } public String getHighRiskFileCode() { return highRiskFileCode; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientManagerRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientManagerRequest.java index bda0178..93c6ddd 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientManagerRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientManagerRequest.java @@ -155,9 +155,19 @@ public class PatientManagerRequest extends BasePageQueryRequest { //1 本县嫁外县 2 外县嫁本县 private Integer wqxType; + //大同本院职工 1为是 0为否 + private Integer userType; private String booksuifangDoctor; + public Integer getUserType() { + return userType; + } + + public void setUserType(Integer userType) { + this.userType = userType; + } + public String getBooksuifangDoctor() { return booksuifangDoctor; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java index 50b60ad..9a78048 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java @@ -90,6 +90,15 @@ public class YunBookbuildingAddRequest { private String riskFactorId; private String level; + private Integer userType;//大同本院职工 1为是 0为否 + + public Integer getUserType() { + return userType; + } + + public void setUserType(Integer userType) { + this.userType = userType; + } public String getRiskFactorId() { return riskFactorId; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientManagerQueryModel.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientManagerQueryModel.java index 42d11ce..f6b71a1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientManagerQueryModel.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientManagerQueryModel.java @@ -132,6 +132,8 @@ public class PatientManagerQueryModel { //预产期 private Date dueDate; + private Integer userType;//大同职工 1为是 0为否 + public Integer getOrgType() { return orgType; } 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 2500247..1ba1b8c 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 @@ -29,7 +29,8 @@ public interface IPostReviewService extends IBaseService { String provinceId, String cityId, String areaId, - String streetId); + String streetId, + Integer userType); - void postpartumReviewExport(Integer userId, Date startDate, Date endDate, String doctorId, String key, HttpServletResponse response,Integer startDay, Integer endDay); + void postpartumReviewExport(Integer userId, Date startDate, Date endDate, String doctorId, String key, HttpServletResponse response,Integer startDay, Integer endDay,Integer userType); } 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 49db518..0540bb5 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 @@ -77,7 +77,8 @@ public class PostReviewServiceImpl extends BaseServiceImpl implements IPostRevie String provinceId, String cityId, String areaId, - String streetId + String streetId, + Integer userType ) { @@ -251,7 +252,7 @@ public class PostReviewServiceImpl extends BaseServiceImpl implements IPostRevie } - if(StringUtils.isNotEmpty(key) || StringUtils.isNotEmpty(gcDoctorId)) { + if(StringUtils.isNotEmpty(key) || StringUtils.isNotEmpty(gcDoctorId) || userType!=null) { Criteria criteria = new Criteria(); if (StringUtils.isNotEmpty(gcDoctorId)) { @@ -261,6 +262,9 @@ public class PostReviewServiceImpl extends BaseServiceImpl implements IPostRevie { criteria.orOperator(Criteria.where("username").regex(key), Criteria.where("cardNo").is(key), Criteria.where("phone").is(key).and("yn").ne(0)); } + if (userType!=null){ + criteria.and("userType").is(userType); + } List patients = mongoUtil.findField(Patients.class, criteria, "id"); if(CollectionUtils.isEmpty(patients)) { return RespBuilder.buildSuccess(new PageResult(0, page, limit, null)); @@ -340,9 +344,9 @@ public class PostReviewServiceImpl extends BaseServiceImpl implements IPostRevie } @Override - public void postpartumReviewExport(Integer userId, Date startDate, Date endDate, String doctorId, String key, HttpServletResponse response,Integer startDay, Integer endDay) { + public void postpartumReviewExport(Integer userId, Date startDate, Date endDate, String doctorId, String key, HttpServletResponse response,Integer startDay, Integer endDay,Integer userType) { BaseObjectResponse rest = postpartumReview(userId, startDate, endDate, doctorId, key, 1, Integer.MAX_VALUE,startDay,endDay,null,null,null,null,null,null,null,null,null,null,null,null, - null,null,null,null,null); + null,null,null,null,null,userType); PageResult pageResult = (PageResult) rest.getData(); List> datas = (List>) pageResult.getGrid(); Map cnames = new LinkedHashMap<>(); -- 1.8.3.1