Commit a1ce2468f5ad43e5e6412de4abf50dceecddc42d
1 parent
c8eae64a82
Exists in
master
and in
6 other branches
两癌个案审核
Showing 14 changed files with 335 additions and 20 deletions
- platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java
- platform-dal/src/main/java/com/lyms/platform/query/CancerScreeningQuery.java
- platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/model/SaveMaternalFollowupInfo.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/Public2PathFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CancerScreeningRequest.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CervicalCancerListRequest.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java
View file @
a1ce246
| ... | ... | @@ -746,6 +746,36 @@ | 
| 746 | 746 | //选项指标记录 | 
| 747 | 747 | private List<Object> recordChoice; | 
| 748 | 748 | |
| 749 | + //儿童文化程度ID | |
| 750 | + private String babyLevelId; | |
| 751 | + //儿童居住类别 | |
| 752 | + private String babyLiveType; | |
| 753 | + //本人电话 | |
| 754 | + private String selfPhone; | |
| 755 | + | |
| 756 | + public String getBabyLevelId() { | |
| 757 | + return babyLevelId; | |
| 758 | + } | |
| 759 | + | |
| 760 | + public void setBabyLevelId(String babyLevelId) { | |
| 761 | + this.babyLevelId = babyLevelId; | |
| 762 | + } | |
| 763 | + | |
| 764 | + public String getBabyLiveType() { | |
| 765 | + return babyLiveType; | |
| 766 | + } | |
| 767 | + | |
| 768 | + public void setBabyLiveType(String babyLiveType) { | |
| 769 | + this.babyLiveType = babyLiveType; | |
| 770 | + } | |
| 771 | + | |
| 772 | + public String getSelfPhone() { | |
| 773 | + return selfPhone; | |
| 774 | + } | |
| 775 | + | |
| 776 | + public void setSelfPhone(String selfPhone) { | |
| 777 | + this.selfPhone = selfPhone; | |
| 778 | + } | |
| 749 | 779 | |
| 750 | 780 | public Integer getIsAppCreate() { | 
| 751 | 781 | return isAppCreate; | 
platform-dal/src/main/java/com/lyms/platform/query/CancerScreeningQuery.java
View file @
a1ce246
| ... | ... | @@ -134,7 +134,15 @@ | 
| 134 | 134 | private Date startExamineDate;//审核时间/驳回时间 | 
| 135 | 135 | private Date endExamineDate;//审核时间/驳回时间 | 
| 136 | 136 | private Integer position;// 审核级别 1 录入 2 县(行政审核) 3 市(行政审核) 4 省(行政审核) 5 国家(行政审核) 6 驳回待修改 7 驳回已修改 | 
| 137 | + private Integer status; | |
| 138 | + public Integer getStatus() { | |
| 139 | + return status; | |
| 140 | + } | |
| 137 | 141 | |
| 142 | + public void setStatus(Integer status) { | |
| 143 | + this.status = status; | |
| 144 | + } | |
| 145 | + | |
| 138 | 146 | public Date getStartExamineDate() { | 
| 139 | 147 | return startExamineDate; | 
| 140 | 148 | } | 
| ... | ... | @@ -197,6 +205,9 @@ | 
| 197 | 205 | } | 
| 198 | 206 | if(null != yn){ | 
| 199 | 207 | condition=condition.and("yn", yn, MongoOper.IS); | 
| 208 | + } | |
| 209 | + if(null != status){ | |
| 210 | + condition=condition.and("position", status, MongoOper.IS); | |
| 200 | 211 | } | 
| 201 | 212 | if(null != zhzd){ | 
| 202 | 213 | condition=condition.and("sfZhzd.yn", zhzd, MongoOper.IS); | 
platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/model/SaveMaternalFollowupInfo.java
View file @
a1ce246
| ... | ... | @@ -4,6 +4,8 @@ | 
| 4 | 4 | import com.lyms.platform.common.utils.DateUtil; | 
| 5 | 5 | import com.lyms.platform.common.utils.JsonUtil; | 
| 6 | 6 | import com.lyms.platform.common.utils.StringUtils; | 
| 7 | +import com.lyms.platform.operate.web.facade.ViewFacade; | |
| 8 | +import com.lyms.platform.operate.web.utils.FunvCommonUtil; | |
| 7 | 9 | import com.lyms.platform.operate.web.utils.UnitConstants; | 
| 8 | 10 | import com.lyms.platform.operate.web.utils.UnitUtils; | 
| 9 | 11 | import com.lyms.platform.permission.service.OrganizationService; | 
| ... | ... | @@ -13,9 +15,7 @@ | 
| 13 | 15 | import org.apache.commons.collections.CollectionUtils; | 
| 14 | 16 | import org.apache.commons.collections.MapUtils; | 
| 15 | 17 | |
| 16 | -import java.util.Date; | |
| 17 | -import java.util.List; | |
| 18 | -import java.util.Map; | |
| 18 | +import java.util.*; | |
| 19 | 19 | |
| 20 | 20 | /** | 
| 21 | 21 | * 公卫2.0-新增非首次产前随访 | 
| ... | ... | @@ -59,7 +59,8 @@ | 
| 59 | 59 | private String personInfoId; //类型:String 必有字段 备注:个人档案ID | 
| 60 | 60 | private String maternalRegisterId; //类型:String 必有字段 备注:孕产登记ID | 
| 61 | 61 | |
| 62 | - public void convertToDataModel(AntenatalExaminationModel examinationModel, Patients patients, OrganizationService organizationService){ | |
| 62 | + public void convertToDataModel(AntenatalExaminationModel examinationModel, | |
| 63 | + Patients patients, OrganizationService organizationService, ViewFacade viewFacade){ | |
| 63 | 64 | setIsAppCreate(0); | 
| 64 | 65 | |
| 65 | 66 | setServiceTimes(null); | 
| 66 | 67 | |
| 67 | 68 | |
| ... | ... | @@ -82,18 +83,64 @@ | 
| 82 | 83 | } | 
| 83 | 84 | } | 
| 84 | 85 | } | 
| 85 | - setPregHealthAbnormDesc(null); | |
| 86 | + | |
| 87 | + if (StringUtils.isNotEmpty(examinationModel.getRiskFactor())) | |
| 88 | + { | |
| 89 | + Map <String, Object> map = new HashMap<>(); | |
| 90 | + viewFacade.getRisk(examinationModel.getRiskFactor(), examinationModel.getOtherRisk(), map); | |
| 91 | + | |
| 92 | + if (map.size() != 0 && map.get("highRisk") != null) | |
| 93 | + { | |
| 94 | + List <Map<String, Object>> list =(ArrayList)map.get("highRisk"); | |
| 95 | + for (Map<String,Object> map1 : list) | |
| 96 | + { | |
| 97 | + String riskNames = null; | |
| 98 | + String riskName = String.valueOf(map1.get("name")); | |
| 99 | + riskNames+=riskName+ " "; | |
| 100 | + if ("健康".equals(riskName)) | |
| 101 | + { | |
| 102 | + setPregHealthAbnormCode("1"); | |
| 103 | + setPregHealthAbnormDesc(null); | |
| 104 | + break; | |
| 105 | + } | |
| 106 | + setPregHealthAbnormCode("2"); | |
| 107 | + setPregHealthAbnormDesc(riskNames); | |
| 108 | + } | |
| 109 | + } | |
| 110 | + } | |
| 111 | + | |
| 86 | 112 | setReferralReason(null); | 
| 87 | - setPregHealthAbnormCode(null); | |
| 88 | 113 | setReferralCode(null); | 
| 89 | 114 | setReferralContacts(null); | 
| 90 | 115 | setFreeScreeningCode(null); | 
| 91 | 116 | setReferralResultCode(null); | 
| 92 | 117 | setReferralTel(null); | 
| 93 | 118 | setAntenatalOrgName(organizationService.getOrganizationName(examinationModel.getHospitalId())); | 
| 94 | - setFollowupWayCode(null); | |
| 95 | - setLastMensesCode(null); | |
| 96 | - setRecordChoice(null); | |
| 119 | + setFollowupWayCode("1"); | |
| 120 | + setLastMensesCode("无"); | |
| 121 | + | |
| 122 | + List<Map> recordChoices = new ArrayList<>(); | |
| 123 | + Map<String,String> data = new HashMap<>(); | |
| 124 | + data.put("codeType","womenHealthGuid2"); | |
| 125 | + data.put("code","1"); | |
| 126 | + data.put("name","生活方式"); | |
| 127 | + recordChoices.add(data); | |
| 128 | + | |
| 129 | + data.put("codeType","womenHealthGuid2"); | |
| 130 | + data.put("code","2"); | |
| 131 | + data.put("name","营养"); | |
| 132 | + recordChoices.add(data); | |
| 133 | + | |
| 134 | + data.put("codeType","womenHealthGuid2"); | |
| 135 | + data.put("code","3"); | |
| 136 | + data.put("name","心理"); | |
| 137 | + recordChoices.add(data); | |
| 138 | + | |
| 139 | + data.put("codeType","womenHealthGuid2"); | |
| 140 | + data.put("code","4"); | |
| 141 | + data.put("name","运动"); | |
| 142 | + recordChoices.add(data); | |
| 143 | + setRecordChoice(recordChoice); | |
| 97 | 144 | setNextVisitTypeCode("1"); | 
| 98 | 145 | setFollowupDate(DateUtil.getyyyy_MM_dd(examinationModel.getCheckDate())); | 
| 99 | 146 | setChiefComplaint(examinationModel.getChiefComplaint()); | 
| ... | ... | @@ -111,7 +158,7 @@ | 
| 111 | 158 | setSbp(StringUtils.isNotEmpty(ssy) ? Integer.parseInt(ssy) : null); | 
| 112 | 159 | setDbp(StringUtils.isNotEmpty(szy) ? Integer.parseInt(szy) : null); | 
| 113 | 160 | setHgb(StringUtils.isNotEmpty(examinationModel.getHemoglobin()) ? Double.parseDouble(examinationModel.getHemoglobin()) : null); | 
| 114 | - setProQualResultCode(null); | |
| 161 | + setProQualResultCode(examinationModel.getUrineProtein()); | |
| 115 | 162 | setOtherAssistExam(null); | 
| 116 | 163 | setNextFollowupDate(DateUtil.getyyyy_MM_dd(examinationModel.getNextCheckTime())); | 
| 117 | 164 | setName(patients.getUsername()); | 
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
View file @
a1ce246
| ... | ... | @@ -1438,7 +1438,9 @@ | 
| 1438 | 1438 | // hujiaqi添加了一个字段,判断是插入还是更新,如果是更新,就不更新birth字段 | 
| 1439 | 1439 | BabyModel bm = new BabyModel(); | 
| 1440 | 1440 | bm.setEndCase(b.getEndCase()); | 
| 1441 | - | |
| 1441 | + bm.setBabyLevelId(b.getBabyLevelId()); | |
| 1442 | + bm.setBabyLiveType(b.getBabyLiveType()); | |
| 1443 | + bm.setSelfPhone(b.getSelfPhone()); | |
| 1442 | 1444 | bm.setMfileCode(b.getMfileCode()); | 
| 1443 | 1445 | bm.setBeforeName(b.getBeforeName()); | 
| 1444 | 1446 | bm.setNationId(b.getNationId()); | 
| ... | ... | @@ -1989,6 +1991,11 @@ | 
| 1989 | 1991 | */ | 
| 1990 | 1992 | private BabyBuildResult getBabyBuildResult(BabyModel model) { | 
| 1991 | 1993 | BabyBuildResult result = new BabyBuildResult(); | 
| 1994 | + | |
| 1995 | + result.setBabyLevelId(model.getBabyLevelId()); | |
| 1996 | + result.setBabyLiveType(model.getBabyLiveType()); | |
| 1997 | + result.setSelfPhone(model.getSelfPhone()); | |
| 1998 | + | |
| 1992 | 1999 | /*滦平 start */ | 
| 1993 | 2000 | result.setEsfs(model.getEsfs()); | 
| 1994 | 2001 | result.setTxng(model.getTxng()); | 
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java
View file @
a1ce246
| ... | ... | @@ -96,7 +96,10 @@ | 
| 96 | 96 | query.setNeed("need"); | 
| 97 | 97 | query.setYn(YnEnums.YES.getId()); | 
| 98 | 98 | query.setQueryNo(queryRequest.getQueryNo()); | 
| 99 | - | |
| 99 | + if (queryRequest.getStatus() != null) | |
| 100 | + { | |
| 101 | + query.setStatus(queryRequest.getStatus()); | |
| 102 | + } | |
| 100 | 103 | if (queryRequest.getPosition() == 1) | 
| 101 | 104 | { | 
| 102 | 105 | query.setHospitalId(hospitalId); | 
| 103 | 106 | |
| 104 | 107 | |
| ... | ... | @@ -108,11 +111,38 @@ | 
| 108 | 111 | else if (queryRequest.getPosition() == 3) | 
| 109 | 112 | { | 
| 110 | 113 | query.setOrgCityId(organization.getCityId()); | 
| 114 | + if(StringUtils.isNotEmpty(queryRequest.getOrgCityId())) | |
| 115 | + { | |
| 116 | + query.setOrgAreaId(queryRequest.getOrgAreaId()); | |
| 117 | + } | |
| 111 | 118 | } | 
| 112 | 119 | else if (queryRequest.getPosition() == 4) | 
| 113 | 120 | { | 
| 114 | 121 | query.setOrgProvinceId(organization.getProvinceId()); | 
| 122 | + if(StringUtils.isNotEmpty(queryRequest.getOrgCityId())) | |
| 123 | + { | |
| 124 | + query.setOrgCityId(queryRequest.getOrgCityId()); | |
| 125 | + } | |
| 126 | + if(StringUtils.isNotEmpty(queryRequest.getOrgCityId())) | |
| 127 | + { | |
| 128 | + query.setOrgAreaId(queryRequest.getOrgAreaId()); | |
| 129 | + } | |
| 115 | 130 | } | 
| 131 | + else | |
| 132 | + { | |
| 133 | + if(StringUtils.isNotEmpty(queryRequest.getOrgProvinceId())) | |
| 134 | + { | |
| 135 | + query.setOrgProvinceId(queryRequest.getOrgProvinceId()); | |
| 136 | + } | |
| 137 | + if(StringUtils.isNotEmpty(queryRequest.getOrgCityId())) | |
| 138 | + { | |
| 139 | + query.setOrgCityId(queryRequest.getOrgCityId()); | |
| 140 | + } | |
| 141 | + if(StringUtils.isNotEmpty(queryRequest.getOrgCityId())) | |
| 142 | + { | |
| 143 | + query.setOrgAreaId(queryRequest.getOrgAreaId()); | |
| 144 | + } | |
| 145 | + } | |
| 116 | 146 | if (StringUtils.isNotEmpty(queryRequest.getExamineDate())) { | 
| 117 | 147 | String[] arrs = queryRequest.getExamineDate().split(" - "); | 
| 118 | 148 | Date start = DateUtil.parseYMD(arrs[0]); | 
| 119 | 149 | |
| ... | ... | @@ -1073,11 +1103,44 @@ | 
| 1073 | 1103 | { | 
| 1074 | 1104 | Criteria c = Criteria.where("cityId").is(organization.getCityId()); | 
| 1075 | 1105 | query.addCriteria(c); | 
| 1106 | + if(StringUtils.isNotEmpty(request.getAreaId())) | |
| 1107 | + { | |
| 1108 | + Criteria c1 = Criteria.where("areaId").is(request.getAreaId()); | |
| 1109 | + query.addCriteria(c1); | |
| 1110 | + } | |
| 1076 | 1111 | } | 
| 1077 | 1112 | else if (request.getPosition() == 4) | 
| 1078 | 1113 | { | 
| 1079 | 1114 | Criteria c = Criteria.where("provinceId").is(organization.getProvinceId()); | 
| 1080 | 1115 | query.addCriteria(c); | 
| 1116 | + if(StringUtils.isNotEmpty(request.getCityId())) | |
| 1117 | + { | |
| 1118 | + Criteria c1 = Criteria.where("cityId").is(request.getCityId()); | |
| 1119 | + query.addCriteria(c1); | |
| 1120 | + } | |
| 1121 | + if(StringUtils.isNotEmpty(request.getAreaId())) | |
| 1122 | + { | |
| 1123 | + Criteria c1 = Criteria.where("areaId").is(request.getAreaId()); | |
| 1124 | + query.addCriteria(c1); | |
| 1125 | + } | |
| 1126 | + } | |
| 1127 | + else | |
| 1128 | + { | |
| 1129 | + if(StringUtils.isNotEmpty(request.getProvinceId())) | |
| 1130 | + { | |
| 1131 | + Criteria c1 = Criteria.where("provinceId").is(request.getProvinceId()); | |
| 1132 | + query.addCriteria(c1); | |
| 1133 | + } | |
| 1134 | + if(StringUtils.isNotEmpty(request.getCityId())) | |
| 1135 | + { | |
| 1136 | + Criteria c1 = Criteria.where("cityId").is(request.getCityId()); | |
| 1137 | + query.addCriteria(c1); | |
| 1138 | + } | |
| 1139 | + if(StringUtils.isNotEmpty(request.getAreaId())) | |
| 1140 | + { | |
| 1141 | + Criteria c1 = Criteria.where("areaId").is(request.getAreaId()); | |
| 1142 | + query.addCriteria(c1); | |
| 1143 | + } | |
| 1081 | 1144 | } | 
| 1082 | 1145 | |
| 1083 | 1146 | if (StringUtils.isNotEmpty(request.getOptDate())) { | 
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/Public2PathFacade.java
View file @
a1ce246
| ... | ... | @@ -42,8 +42,9 @@ | 
| 42 | 42 | PatientsService patientsService; | 
| 43 | 43 | @Autowired | 
| 44 | 44 | private BasicConfigService basicConfigService; | 
| 45 | - | |
| 46 | 45 | @Autowired | 
| 46 | + private AntExRecordService recordService; | |
| 47 | + @Autowired | |
| 47 | 48 | private OrganizationService organizationService; | 
| 48 | 49 | @Autowired | 
| 49 | 50 | private ViewFacade viewFacade; | 
| 50 | 51 | |
| 51 | 52 | |
| ... | ... | @@ -534,16 +535,20 @@ | 
| 534 | 535 | for (AntenatalExaminationModel model : models) { | 
| 535 | 536 | try { | 
| 536 | 537 | //数据转换 | 
| 537 | - SaveMaternalFollowupInfo modelInfo=new SaveMaternalFollowupInfo(); | |
| 538 | - | |
| 539 | - | |
| 538 | + SaveMaternalFollowupInfo modelInfo = new SaveMaternalFollowupInfo(); | |
| 540 | 539 | Patients patients = patientsService.findOnePatientById(model.getParentId()); | 
| 541 | - | |
| 542 | 540 | if (patients == null) | 
| 543 | 541 | { | 
| 544 | 542 | continue; | 
| 545 | 543 | } | 
| 546 | - modelInfo.convertToDataModel(model,patients,organizationService); | |
| 544 | + modelInfo.convertToDataModel(model,patients,organizationService,viewFacade); | |
| 545 | + AntExRecordQuery antExRecordQuery1 = new AntExRecordQuery(); | |
| 546 | + antExRecordQuery1.setCheckTimeStart(patients.getLastMenses()); | |
| 547 | + antExRecordQuery1.setCheckTimeEnd(new Date()); | |
| 548 | + antExRecordQuery1.setPid(patients.getPid()); | |
| 549 | + Integer count = recordService.count(antExRecordQuery1); | |
| 550 | + | |
| 551 | + modelInfo.setServiceTimes(count); | |
| 547 | 552 | Map<String,String> patientInfo = getPersonInfo(patients); | 
| 548 | 553 | |
| 549 | 554 | if (patientInfo == null || patientInfo.size() == 0) | 
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
a1ce246
| ... | ... | @@ -5602,6 +5602,11 @@ | 
| 5602 | 5602 | |
| 5603 | 5603 | result.setLiveType(getBasicConfig(model.getLiveType())); | 
| 5604 | 5604 | |
| 5605 | + result.setBabyLevelId(getBasicConfig(model.getBabyLevelId())); | |
| 5606 | + result.setBabyLiveType(getBasicConfig(model.getBabyLiveType())); | |
| 5607 | + result.setSelfPhone(model.getSelfPhone()); | |
| 5608 | + | |
| 5609 | + | |
| 5605 | 5610 | result.setFatherLevel(getBasicConfig(model.getfLevelId())); | 
| 5606 | 5611 | result.setFatherProfessionType(getBasicConfig(model.getFproTypeId())); | 
| 5607 | 5612 | //隆化-儿童预约建档号(根据最新一条儿童档案的就诊号数字段+1生成) | 
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java
View file @
a1ce246
| ... | ... | @@ -529,6 +529,38 @@ | 
| 529 | 529 | //选项指标记录 | 
| 530 | 530 | private List<Object> recordChoice; | 
| 531 | 531 | |
| 532 | + | |
| 533 | + //儿童文化程度ID | |
| 534 | + private String babyLevelId; | |
| 535 | + //儿童居住类别 | |
| 536 | + private String babyLiveType; | |
| 537 | + //本人电话 | |
| 538 | + private String selfPhone; | |
| 539 | + | |
| 540 | + public String getBabyLevelId() { | |
| 541 | + return babyLevelId; | |
| 542 | + } | |
| 543 | + | |
| 544 | + public void setBabyLevelId(String babyLevelId) { | |
| 545 | + this.babyLevelId = babyLevelId; | |
| 546 | + } | |
| 547 | + | |
| 548 | + public String getBabyLiveType() { | |
| 549 | + return babyLiveType; | |
| 550 | + } | |
| 551 | + | |
| 552 | + public void setBabyLiveType(String babyLiveType) { | |
| 553 | + this.babyLiveType = babyLiveType; | |
| 554 | + } | |
| 555 | + | |
| 556 | + public String getSelfPhone() { | |
| 557 | + return selfPhone; | |
| 558 | + } | |
| 559 | + | |
| 560 | + public void setSelfPhone(String selfPhone) { | |
| 561 | + this.selfPhone = selfPhone; | |
| 562 | + } | |
| 563 | + | |
| 532 | 564 | public Integer getIsAppCreate() { | 
| 533 | 565 | return isAppCreate; | 
| 534 | 566 | } | 
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CancerScreeningRequest.java
View file @
a1ce246
| ... | ... | @@ -93,6 +93,15 @@ | 
| 93 | 93 | |
| 94 | 94 | private String examineDate;//审核时间/驳回时间 | 
| 95 | 95 | private Integer position;// 审核级别 1 录入 2 县(行政审核) 3 市(行政审核) 4 省(行政审核) 5 国家(行政审核) 6 驳回待修改 7 驳回已修改 | 
| 96 | + private Integer status; // 1 录入 2 县(行政审核) 3 市(行政审核) 4 省(行政审核) 5 国家(行政审核) 6 驳回待修改 7 驳回已修改 | |
| 97 | + | |
| 98 | + public Integer getStatus() { | |
| 99 | + return status; | |
| 100 | + } | |
| 101 | + | |
| 102 | + public void setStatus(Integer status) { | |
| 103 | + this.status = status; | |
| 104 | + } | |
| 96 | 105 | |
| 97 | 106 | public String getExamineDate() { | 
| 98 | 107 | return examineDate; | 
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CervicalCancerListRequest.java
View file @
a1ce246
| ... | ... | @@ -61,6 +61,15 @@ | 
| 61 | 61 | private String hpv; | 
| 62 | 62 | private String examineDate;//审核时间/驳回时间 | 
| 63 | 63 | private Integer position;// 审核级别 1 录入 2 县(行政审核) 3 市(行政审核) 4 省(行政审核) 5 国家(行政审核) 6 驳回待修改 7 驳回已修改 | 
| 64 | + private Integer status; // 1 录入 2 县(行政审核) 3 市(行政审核) 4 省(行政审核) 5 国家(行政审核) 6 驳回待修改 7 驳回已修改 | |
| 65 | + | |
| 66 | + public Integer getStatus() { | |
| 67 | + return status; | |
| 68 | + } | |
| 69 | + | |
| 70 | + public void setStatus(Integer status) { | |
| 71 | + this.status = status; | |
| 72 | + } | |
| 64 | 73 | |
| 65 | 74 | public String getExamineDate() { | 
| 66 | 75 | return examineDate; | 
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java
View file @
a1ce246
| ... | ... | @@ -459,6 +459,36 @@ | 
| 459 | 459 | |
| 460 | 460 | private String yfCode; //预防接种证条码号 | 
| 461 | 461 | private String reason; //原因 | 
| 462 | + //儿童文化程度ID | |
| 463 | + private String babyLevelId; | |
| 464 | + //儿童居住类别 | |
| 465 | + private String babyLiveType; | |
| 466 | + //本人电话 | |
| 467 | + private String selfPhone; | |
| 468 | + | |
| 469 | + public String getBabyLevelId() { | |
| 470 | + return babyLevelId; | |
| 471 | + } | |
| 472 | + | |
| 473 | + public void setBabyLevelId(String babyLevelId) { | |
| 474 | + this.babyLevelId = babyLevelId; | |
| 475 | + } | |
| 476 | + | |
| 477 | + public String getBabyLiveType() { | |
| 478 | + return babyLiveType; | |
| 479 | + } | |
| 480 | + | |
| 481 | + public void setBabyLiveType(String babyLiveType) { | |
| 482 | + this.babyLiveType = babyLiveType; | |
| 483 | + } | |
| 484 | + | |
| 485 | + public String getSelfPhone() { | |
| 486 | + return selfPhone; | |
| 487 | + } | |
| 488 | + | |
| 489 | + public void setSelfPhone(String selfPhone) { | |
| 490 | + this.selfPhone = selfPhone; | |
| 491 | + } | |
| 462 | 492 | |
| 463 | 493 | public String getMfileCode() { | 
| 464 | 494 | return mfileCode; | 
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java
View file @
a1ce246
| ... | ... | @@ -459,6 +459,36 @@ | 
| 459 | 459 | private String childrenBookBuildDate; | 
| 460 | 460 | //选项指标记录 | 
| 461 | 461 | private List<Object> recordChoice; | 
| 462 | + //儿童文化程度ID | |
| 463 | + private String babyLevelId; | |
| 464 | + //儿童居住类别 | |
| 465 | + private String babyLiveType; | |
| 466 | + //本人电话 | |
| 467 | + private String selfPhone; | |
| 468 | + | |
| 469 | + public String getBabyLevelId() { | |
| 470 | + return babyLevelId; | |
| 471 | + } | |
| 472 | + | |
| 473 | + public void setBabyLevelId(String babyLevelId) { | |
| 474 | + this.babyLevelId = babyLevelId; | |
| 475 | + } | |
| 476 | + | |
| 477 | + public String getBabyLiveType() { | |
| 478 | + return babyLiveType; | |
| 479 | + } | |
| 480 | + | |
| 481 | + public void setBabyLiveType(String babyLiveType) { | |
| 482 | + this.babyLiveType = babyLiveType; | |
| 483 | + } | |
| 484 | + | |
| 485 | + public String getSelfPhone() { | |
| 486 | + return selfPhone; | |
| 487 | + } | |
| 488 | + | |
| 489 | + public void setSelfPhone(String selfPhone) { | |
| 490 | + this.selfPhone = selfPhone; | |
| 491 | + } | |
| 462 | 492 | |
| 463 | 493 | public Integer getIsAppCreate() { | 
| 464 | 494 | return isAppCreate; | 
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java
View file @
a1ce246
| ... | ... | @@ -163,7 +163,11 @@ | 
| 163 | 163 | String hospitalId = autoMatchFacade.getHospitalId(userId); | 
| 164 | 164 | Organization organization = organizationService.getOrganization(Integer.parseInt(hospitalId)); | 
| 165 | 165 | Query query = new Query(); | 
| 166 | - | |
| 166 | + if (param.getStatus() != null) | |
| 167 | + { | |
| 168 | + Criteria c = Criteria.where("position").is(param.getStatus()); | |
| 169 | + query.addCriteria(c); | |
| 170 | + } | |
| 167 | 171 | if (param.getPosition() == 1) | 
| 168 | 172 | { | 
| 169 | 173 | Criteria c = Criteria.where("hospitalId").is(hospitalId); | 
| 170 | 174 | |
| ... | ... | @@ -178,11 +182,44 @@ | 
| 178 | 182 | { | 
| 179 | 183 | Criteria c = Criteria.where("orgCityId").is(organization.getCityId()); | 
| 180 | 184 | query.addCriteria(c); | 
| 185 | + if(StringUtils.isNotEmpty(param.getOrgAreaId())) | |
| 186 | + { | |
| 187 | + Criteria c1 = Criteria.where("orgAreaId").is(param.getOrgAreaId()); | |
| 188 | + query.addCriteria(c1); | |
| 189 | + } | |
| 181 | 190 | } | 
| 182 | 191 | else if (param.getPosition() == 4) | 
| 183 | 192 | { | 
| 184 | 193 | Criteria c = Criteria.where("orgProvinceId").is(organization.getProvinceId()); | 
| 185 | 194 | query.addCriteria(c); | 
| 195 | + if(StringUtils.isNotEmpty(param.getOrgCityId())) | |
| 196 | + { | |
| 197 | + Criteria c1 = Criteria.where("orgCityId").is(param.getOrgCityId()); | |
| 198 | + query.addCriteria(c1); | |
| 199 | + } | |
| 200 | + if(StringUtils.isNotEmpty(param.getOrgAreaId())) | |
| 201 | + { | |
| 202 | + Criteria c1 = Criteria.where("orgAreaId").is(param.getOrgAreaId()); | |
| 203 | + query.addCriteria(c1); | |
| 204 | + } | |
| 205 | + } | |
| 206 | + else | |
| 207 | + { | |
| 208 | + if(StringUtils.isNotEmpty(param.getOrgProvinceId())) | |
| 209 | + { | |
| 210 | + Criteria c1 = Criteria.where("orgProvinceId").is(param.getOrgProvinceId()); | |
| 211 | + query.addCriteria(c1); | |
| 212 | + } | |
| 213 | + if(StringUtils.isNotEmpty(param.getOrgCityId())) | |
| 214 | + { | |
| 215 | + Criteria c1 = Criteria.where("orgCityId").is(param.getOrgCityId()); | |
| 216 | + query.addCriteria(c1); | |
| 217 | + } | |
| 218 | + if(StringUtils.isNotEmpty(param.getOrgAreaId())) | |
| 219 | + { | |
| 220 | + Criteria c1 = Criteria.where("orgAreaId").is(param.getOrgAreaId()); | |
| 221 | + query.addCriteria(c1); | |
| 222 | + } | |
| 186 | 223 | } | 
| 187 | 224 | |
| 188 | 225 | String keyword = param.getKeyword(); | 
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
View file @
a1ce246
| ... | ... | @@ -2621,7 +2621,7 @@ | 
| 2621 | 2621 | param.put("hospitalId", CollectionUtils.asList((String) param.get("hospitalId"))); | 
| 2622 | 2622 | } | 
| 2623 | 2623 | } | 
| 2624 | - doHospitalFilter(param); | |
| 2624 | + //doHospitalFilter(param); | |
| 2625 | 2625 | |
| 2626 | 2626 | List<Map<String, Object>> couponReport = new ArrayList<>(); | 
| 2627 | 2627 | List<String> hospitalId = (List<String>) param.get("hospitalId"); |