shiyang / regional-platform

Download as
Browse Code »

Commit 5150c12b99331a0970e4c5fdb3f4d7d5fe58ccc8

Authored by liquanyu
2 parents 544daf1d4f 4bf8dd6bf7
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 9 changed files

platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java View file @ 5150c12
... ... @@ -21,7 +21,6 @@
21 21 /**
22 22 * 身份证号码
23 23 */
24   - @Field("cardno")
25 24 private String cardNo;
26 25 /**
27 26 * 助产机构
platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java View file @ 5150c12
... ... @@ -391,7 +391,7 @@
391 391 condition = condition.and("vcCardNo", vcCardNo, MongoOper.IS);
392 392 }
393 393 if (null != cardNo) {
394   - condition = condition.and("cardno", cardNo, MongoOper.IS);
  394 + condition = condition.and("cardNo", cardNo, MongoOper.IS);
395 395  
396 396 }
397 397 if (null != phone) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StatisticsController.java View file @ 5150c12
... ... @@ -74,7 +74,7 @@
74 74 Map<String, Integer> mapsData = new HashMap<>();
75 75 Map<String, String> riskColorMap = new HashMap<>();
76 76  
77   - Option areaBarOption = buildyBarOption("建档&高危人数", null);
  77 + Option areaBarOption = buildyBarOption("建档及高危人数", null);
78 78 areaBarOption.getLegend().getData().add("近30天建档人数");
79 79 areaBarOption.getLegend().getData().add("当前高危总人数");
80 80 areaBarOption.getLegend().setOrient("horizontal");
81 81  
... ... @@ -136,11 +136,10 @@
136 136 option.getLegend().setTop("50px");
137 137 List<Object> seriesList = new ArrayList<>();
138 138 Series series = new Series();
139   - series.setName("建档&高危数");
  139 + series.setName("建档及高危数");
140 140 series.setType("map");
141 141 series.setMapType("china");
142 142 series.setRoam(false);
143   - series.setLabel(label);
144 143 series.setData(dataList);
145 144 seriesList.add(series);
146 145 option.setSeries(seriesList);
... ... @@ -154,7 +153,6 @@
154 153 Series groupRiskSeries = new Series();
155 154 groupRiskSeries.setName("高危人数");
156 155 groupRiskSeries.setType("bar");
157   - groupRiskSeries.setLabel(label);
158 156 mapsData.clear();
159 157 for (AreaData areaData:currentRiskList) {
160 158 String groupName = areaData.getGroupName().replace("预警", "");
... ... @@ -184,7 +182,7 @@
184 182 int n = listData.size();
185 183 for (Map.Entry<String, Integer> entry:listData) {
186 184 n--;
187   - if (n>20) {
  185 + if (n>28) {
188 186 continue;
189 187 }
190 188 groupRiskOption.getyAxis().getData().add(entry.getKey());
... ... @@ -229,7 +227,7 @@
229 227 }
230 228 }
231 229 patientMonthMap.put("建档人数", pmap);
232   - Option patientMonthOption = buildLineOption("建档&高危人数", null, patientMonthMap, buildDefaultMonth(12));
  230 + Option patientMonthOption = buildLineOption("建档及高危人数", null, patientMonthMap, buildDefaultMonth(12));
233 231  
234 232 // 按省或市或地区查询区域内近12个自然月每月初诊人数、复诊人数
235 233 query = new AreaDataQuery();
... ... @@ -252,7 +250,7 @@
252 250 }
253 251 reportMonthMap.put("复诊人数", secondmap);
254 252 reportMonthMap.put("初诊人数", firstmap);
255   - Option reportMonthOption = buildLineOption("初诊&复诊人数", null, reportMonthMap, buildDefaultMonth(12));
  253 + Option reportMonthOption = buildLineOption("初诊及复诊人数", null, reportMonthMap, buildDefaultMonth(12));
256 254  
257 255  
258 256 // 近6个月高危数据（按颜色分组）
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AccessPermissionFacade.java View file @ 5150c12
... ... @@ -78,10 +78,12 @@
78 78 PermissionTypeEnums permissionTypeEnums = PermissionTypeEnums.getEnumsById(roles.getPermissiontype());
79 79  
80 80 Assert.notNull(permissionTypeEnums, "权限类型不存在.");
81   -
  81 + if(CollectionUtils.isNotEmpty(accessPermissionAddRequest.getDeptId())){
  82 + permission.setDeptid(accessPermissionAddRequest.getDeptId());
  83 + }
82 84 permission.setType(permissionTypeEnums.getId());
83 85 dataPermissionsModel.getData().clear();
84   - dataPermissionsModel.addOnePer( roles.getHospitalid(), permission);
  86 + dataPermissionsModel.addOnePer(roles.getHospitalid(), permission);
85 87 }else if(PermissionTypeEnums.Type.ADMIN.getId()==NumberUtils.toInt(accessPermissionAddRequest.getType())){
86 88 //如果是院外的权限,就只需要设置医院的id
87 89 permission.setType(PermissionTypeEnums.ALL_HOSPITAL.getId());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ 5150c12
... ... @@ -326,6 +326,13 @@
326 326 antenatalExaminationResult.setDiagnosis(queryRisk(list));
327 327 } catch (Exception e) {
328 328 }
  329 + ReferralApplyOrderQuery referralApplyOrderQuery=new ReferralApplyOrderQuery();
  330 + referralApplyOrderQuery.setParentId(examinationModel.getParentId());
  331 + antenatalExaminationResult.setHasRefer(CollectionUtils.isEmpty(applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery)) ? 0 : 1);
  332 + SieveApplyOrderQuery applyOrderQuery=new SieveApplyOrderQuery();
  333 + applyOrderQuery.setParentId(examinationModel.getParentId());
  334 + applyOrderQuery.setYn(YnEnums.YES.getId());
  335 + antenatalExaminationResult.setHasSieve(CollectionUtils.isEmpty(applyOrderService.querySieveApplyOrderWithQuery(applyOrderQuery))?0:1);
329 336 object = antenatalExaminationResult;
330 337 } else {
331 338 //查询初诊数据
332 339  
... ... @@ -348,8 +355,14 @@
348 355 List list1 = JsonUtil.toList(antExChuModel.getHighrisk(), List.class);
349 356 antexChuResult.setHighrisk(queryRisk(list1));
350 357 } catch (Exception e) {
351   -
352 358 }
  359 + ReferralApplyOrderQuery referralApplyOrderQuery=new ReferralApplyOrderQuery();
  360 + referralApplyOrderQuery.setParentId(antExChuModel.getParentId());
  361 + antexChuResult.setHasRefer(CollectionUtils.isEmpty(applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery)) ? 0 : 1);
  362 + SieveApplyOrderQuery applyOrderQuery=new SieveApplyOrderQuery();
  363 + applyOrderQuery.setParentId(antExChuModel.getParentId());
  364 + applyOrderQuery.setYn(YnEnums.YES.getId());
  365 + antexChuResult.setHasSieve(CollectionUtils.isEmpty(applyOrderService.querySieveApplyOrderWithQuery(applyOrderQuery))?0:1);
353 366 object = antexChuResult;
354 367 }
355 368  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AccessPermissionAddRequest.java View file @ 5150c12
... ... @@ -7,6 +7,7 @@
7 7 import org.hibernate.validator.constraints.NotEmpty;
8 8  
9 9 import javax.validation.constraints.Pattern;
  10 +import java.util.List;
10 11  
11 12 /**
12 13 * Created by Administrator on 2016/3/29 0029.
13 14  
... ... @@ -24,7 +25,16 @@
24 25 //用户id/角色id
25 26 @FormParam("userid")
26 27 private String userId;
  28 + @FormParam
  29 + private List deptId;
27 30  
  31 + public List getDeptId() {
  32 + return deptId;
  33 + }
  34 +
  35 + public void setDeptId(List deptId) {
  36 + this.deptId = deptId;
  37 + }
28 38  
29 39 public String getBizId() {
30 40 return bizId;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java View file @ 5150c12
... ... @@ -69,6 +69,26 @@
69 69 private String checkDate;
70 70 //下次产检日期
71 71 private Map nextCheckTime;
  72 + //是否有转诊
  73 + private int hasRefer;
  74 + //是否有产筛
  75 + private int hasSieve;
  76 +
  77 + public int getHasRefer() {
  78 + return hasRefer;
  79 + }
  80 +
  81 + public void setHasRefer(int hasRefer) {
  82 + this.hasRefer = hasRefer;
  83 + }
  84 +
  85 + public int getHasSieve() {
  86 + return hasSieve;
  87 + }
  88 +
  89 + public void setHasSieve(int hasSieve) {
  90 + this.hasSieve = hasSieve;
  91 + }
72 92  
73 93 public Map getNextCheckTime() {
74 94 return nextCheckTime;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java View file @ 5150c12
... ... @@ -199,6 +199,26 @@
199 199 private String ydqjd;
200 200 //实验结果
201 201 private String syjg;
  202 + //是否有转诊
  203 + private int hasRefer;
  204 + //是否有产筛
  205 + private int hasSieve;
  206 +
  207 + public int getHasRefer() {
  208 + return hasRefer;
  209 + }
  210 +
  211 + public void setHasRefer(int hasRefer) {
  212 + this.hasRefer = hasRefer;
  213 + }
  214 +
  215 + public int getHasSieve() {
  216 + return hasSieve;
  217 + }
  218 +
  219 + public void setHasSieve(int hasSieve) {
  220 + this.hasSieve = hasSieve;
  221 + }
202 222  
203 223 public String getSyjg() {
204 224 return syjg;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java View file @ 5150c12
... ... @@ -39,10 +39,20 @@
39 39 private String applyDoctor;
40 40 //接收日期
41 41 private String received;
  42 + private String cardNo;
  43 +
42 44 //创建时间
43 45 private String created;
44 46 private String status;
45 47  
  48 + public String getCardNo() {
  49 + return cardNo;
  50 + }
  51 +
  52 + public void setCardNo(String cardNo) {
  53 + this.cardNo = cardNo;
  54 + }
  55 +
46 56 public Integer getAge() {
47 57 return age;
48 58 }
... ... @@ -197,6 +207,7 @@
197 207 setStatus(ApplyOrderStatusEnums.getTitle(destModel.getStatus()));
198 208 setTransferredHospital(destModel.getTransferredHospital());
199 209 setAge(destModel.getAge());
  210 + setCardNo(destModel.getCardNo());
200 211 return this;
201 212 }
202 213 }