shiyang / regional-platform

Download as
Browse Code »

Commit 127d530889732ab47c01d6d641fee65a289694be

Authored by liquanyu
2 parents ba0c4c475d 8df0e5c0bb
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 5 changed files

platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java View file @ 127d530
... ... @@ -21,7 +21,7 @@
21 21 //分娩孕周
22 22 private String dueWeek;
23 23 //台数
24   - private int tireNumber;
  24 + private Integer tireNumber;
25 25 //胎盘
26 26 private String placenta;
27 27 /*//心率
... ... @@ -45,7 +45,7 @@
45 45 //会阴情况
46 46 private String perinealCondition;
47 47 //撕裂等级
48   - private int siLielevel;
  48 + private Integer siLielevel;
49 49 //锋线针数
50 50 private Integer needleNum;
51 51 //产妇情况
52 52  
... ... @@ -396,11 +396,11 @@
396 396 this.sHloseBloodL = sHloseBloodL;
397 397 }
398 398  
399   - public int getSiLielevel() {
  399 + public Integer getSiLielevel() {
400 400 return siLielevel;
401 401 }
402 402  
403   - public void setSiLielevel(int siLielevel) {
  403 + public void setSiLielevel(Integer siLielevel) {
404 404 this.siLielevel = siLielevel;
405 405 }
406 406  
407 407  
... ... @@ -412,11 +412,11 @@
412 412 this.tHloseBloodL = tHloseBloodL;
413 413 }
414 414  
415   - public int getTireNumber() {
  415 + public Integer getTireNumber() {
416 416 return tireNumber;
417 417 }
418 418  
419   - public void setTireNumber(int tireNumber) {
  419 + public void setTireNumber(Integer tireNumber) {
420 420 this.tireNumber = tireNumber;
421 421 }
422 422  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StatisticsController.java View file @ 127d530
... ... @@ -55,11 +55,11 @@
55 55 public void getTotalIndex(HttpServletResponse response, @RequestParam(value = "type")Integer type, @RequestParam(value = "pid", required = false)String pid) {
56 56 Map<String,Object> result= new HashMap<String, Object>();
57 57 Map<String, String> colormap = new HashMap<>();
58   - colormap.put("紫色", "#ff00ff");
59   - colormap.put("红色", "#ff0000");
60   - colormap.put("橙色", "#ff8800");
  58 + colormap.put("紫色", "#be75ff");
  59 + colormap.put("红色", "#ff6767");
  60 + colormap.put("橙色", "#ffb02e");
61 61 colormap.put("黄色", "#ffff00");
62   - colormap.put("其他", "#DEDCE0");
  62 + colormap.put("其他", "#ffd84d");
63 63  
64 64 Normal normal = new Normal(true, null);
65 65 Label label = new Label();
66 66  
... ... @@ -181,7 +181,12 @@
181 181 });
182 182  
183 183 List<Object> groupRiskDataList = new ArrayList<>();
  184 + int n = listData.size();
184 185 for (Map.Entry<String, Integer> entry:listData) {
  186 + n--;
  187 + if (n>20) {
  188 + continue;
  189 + }
185 190 groupRiskOption.getyAxis().getData().add(entry.getKey());
186 191 if (riskColorMap.containsKey(entry.getKey())) {
187 192 Data data = new Data();
188 193  
... ... @@ -245,8 +250,8 @@
245 250 secondmap.put(month, areaData.getVal2());
246 251 }
247 252 }
248   - reportMonthMap.put("初诊人数", firstmap);
249 253 reportMonthMap.put("复诊人数", secondmap);
  254 + reportMonthMap.put("初诊人数", firstmap);
250 255 Option reportMonthOption = buildLineOption("初诊&复诊人数", null, reportMonthMap, buildDefaultMonth(12));
251 256  
252 257  
253 258  
254 259  
255 260  
... ... @@ -426,18 +431,22 @@
426 431 title.setSubtext(subTitle);
427 432 option.setTitle(title);
428 433 Tooltip tooltip = new Tooltip();
  434 + tooltip.setShow(true);
429 435 tooltip.setTrigger("axis");
430 436 AxisPointer axisPointer = new AxisPointer();
431 437 axisPointer.setType("shadow");
432 438 tooltip.setAxisPointer(axisPointer);
433 439 option.setTooltip(tooltip);
  440 + List<Object> legendData = new ArrayList<Object>();
434 441 Legend legend = new Legend();
435   - List<Object> tempList = new ArrayList<Object>();
436   - legend.setData(tempList);
  442 + legend.setTop("50px");
  443 + legend.setLeft("center");
  444 + legend.setData(legendData);
  445 + legend.setOrient("horizontal");
437 446 option.setLegend(legend);
438 447 Grid grid = new Grid();
439 448 grid.setContainLabel(true);
440   - grid.setTop("55px");
  449 + grid.setTop("85px");
441 450 grid.setLeft("3%");
442 451 grid.setRight("3%");
443 452 grid.setBottom("3%");
... ... @@ -452,7 +461,7 @@
452 461 List<Object> seriesList = new ArrayList<>();
453 462 option.setSeries(seriesList);
454 463 for (String groupName:map.keySet()) {
455   - tempList.add(groupName);
  464 + legendData.add(groupName);
456 465 Map<String, Integer> sub = map.get(groupName);
457 466 Series series = new Series();
458 467 series.setName(groupName);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java View file @ 127d530
... ... @@ -69,7 +69,7 @@
69 69 //产检日期
70 70 private String checkDate;
71 71 //下次产检日期
72   - private String nextCheckTime;
  72 + private Map nextCheckTime;
73 73  
74 74  
75 75  
... ... @@ -109,7 +109,7 @@
109 109 examinationModel.setGuide(guide);
110 110 examinationModel.setCheckDoctor(checkDoctor);
111 111 examinationModel.setCheckDate(checkDate);
112   - examinationModel.setNextCheckTime(nextCheckTime);
  112 + examinationModel.setNextCheckTime(JsonUtil.obj2JsonString(nextCheckTime));
113 113  
114 114 return examinationModel;
115 115 }
116 116  
... ... @@ -226,11 +226,11 @@
226 226 this.id = id;
227 227 }
228 228  
229   - public String getNextCheckTime() {
  229 + public Map getNextCheckTime() {
230 230 return nextCheckTime;
231 231 }
232 232  
233   - public void setNextCheckTime(String nextCheckTime) {
  233 + public void setNextCheckTime(Map nextCheckTime) {
234 234 this.nextCheckTime = nextCheckTime;
235 235 }
236 236  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java View file @ 127d530
... ... @@ -451,13 +451,18 @@
451 451 babyModel.setYn(YnEnums.YES.getId());
452 452 babyModel.setVisitstatus(VisitStatusEnums.UNVISIT.getId());
453 453 babyModel.setAsphyxiaM(asphyxiaM);
454   - babyModel.setSex(Integer.valueOf(babyGender));
  454 + if(null!=babyGender){
  455 + babyModel.setSex(Integer.valueOf(babyGender));
  456 + }
  457 + if(null!=apgarScore){
  458 + babyModel.setApgarScore(JsonUtil.obj2JsonString(apgarScore));
  459 + }
455 460 babyModel.setModified(new Date());
456 461 babyModel.setBabyHealthy(babyHealthy);
457 462 babyModel.setBabyWeight(babyWeight);
458 463 babyModel.setBabyHeight(babyHeight);
459 464 babyModel.setMalformation(deformity);
460   - babyModel.setApgarScore(JsonUtil.obj2JsonString(apgarScore));
  465 +
461 466 babyModel.setPregnancyOut(pregnancyOut);
462 467 babyModel.setContactM(contactM);
463 468 babyModel.setContactStartM(contactStartM);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java View file @ 127d530
... ... @@ -48,7 +48,7 @@
48 48 //血糖
49 49 private String bloodSugar;
50 50 //高危因素
51   - private List<String> riskFactor;
  51 + private List riskFactor;
52 52 // 高危评分
53 53 private String riskScore;
54 54 //其他高危
55 55  
56 56  
... ... @@ -68,13 +68,13 @@
68 68 //产检日期
69 69 private String checkDate;
70 70 //下次产检日期
71   - private String nextCheckTime;
  71 + private Map nextCheckTime;
72 72  
73   - public String getNextCheckTime() {
  73 + public Map getNextCheckTime() {
74 74 return nextCheckTime;
75 75 }
76 76  
77   - public void setNextCheckTime(String nextCheckTime) {
  77 + public void setNextCheckTime(Map nextCheckTime) {
78 78 this.nextCheckTime = nextCheckTime;
79 79 }
80 80  
... ... @@ -82,7 +82,7 @@
82 82 public AntenatalExaminationResult convertToResult(AntenatalExaminationModel destModel) {
83 83 setEdema(destModel.getEdema());
84 84 setParentId(destModel.getParentId());
85   - setNextCheckTime(destModel.getNextCheckTime());
  85 +
86 86 setUrineProtein(destModel.getUrineProtein());
87 87 setTreatmentOpinion(destModel.getTreatmentOpinion());
88 88  
... ... @@ -93,6 +93,11 @@
93 93 setBp(JsonUtil.str2Obj(destModel.getBp(), java.util.Map.class));
94 94 } catch (Exception e) {
95 95 }
  96 + try {
  97 + setNextCheckTime(JsonUtil.str2Obj(destModel.getNextCheckTime(),Map.class));
  98 + }catch (Exception e){
  99 + }
  100 +
96 101 setChiefComplaint(destModel.getChiefComplaint());
97 102 setCheckDate(destModel.getCheckDate());
98 103 setCheckDoctor(destModel.getCheckDoctor());
99 104  
... ... @@ -250,11 +255,11 @@
250 255 this.parentId = parentId;
251 256 }
252 257  
253   - public List<String> getRiskFactor() {
  258 + public List getRiskFactor() {
254 259 return riskFactor;
255 260 }
256 261  
257   - public void setRiskFactor(List<String> riskFactor) {
  262 + public void setRiskFactor(List riskFactor) {
258 263 this.riskFactor = riskFactor;
259 264 }
260 265