jiangjiazhi / regional-platform

Download as
Browse Code »

Commit d59fb100c33c6640054b2cc67f511f0b1f3bc4cf

Authored by zhangchao
1 parent 13e134da9c
Exists in dev

#fix:优化危急值管理艾梅乙逻辑

Showing 7 changed files with 43 additions and 41 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java View file @ d59fb10
... ... @@ -235,7 +235,7 @@
235 235 crisisItem.setWeek(DateUtil.getWeek(patients.getLastMenses(), model.getPublishTime()));
236 236 crisisItem.setPublishTime(model.getPublishTime());
237 237 try {
238   - crisisItem.setAge(Integer.valueOf(model.getAge()));
  238 + crisisItem.setAge(Integer.valueOf(model.getAge().trim()));
239 239 } catch (Exception e) {
240 240 System.out.println("saveLisCrisisItemList->Exception e," + e);
241 241 }
... ... @@ -254,7 +254,7 @@
254 254 for (LisReportItemModel item : itemList) {
255 255 String code = item.getCode().trim();
256 256 String name= item.getName().trim();
257   - crisisItem.setId(model.getLisId() + "_" + code);
  257 + crisisItem.setId(model.getLisId() + "_" + name+"_"+code);
258 258 crisisItem.setName(model.getType());
259 259 crisisItem.setClassify(model.getType());
260 260 crisisItem.setClassifyName(model.getType());
platform-biz-service/src/main/resources/mainOrm/master/AppointmentMapper.xml View file @ d59fb10
... ... @@ -39,6 +39,9 @@
39 39 <if test="dept!=null">
40 40 and (dept like concat(#{dept},'%') or (dept like concat("产后",'%') and dept !='产后服务部'))
41 41 </if>
  42 + <if test="deptName!=null">
  43 + and dept=#{deptName}
  44 + </if>
42 45 and <![CDATA[checkTime>=#{startTime}]]>
43 46 and <![CDATA[checkTime<=#{endTime}]]>
44 47 <include refid="orderAndLimit"/>
platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java View file @ d59fb10
... ... @@ -505,11 +505,11 @@
505 505 //产筛结果
506 506 private String nipt;//唐氏筛查/无创DNA检测
507 507 //传染病筛查
508   - private String HBcAbJ;//乙肝表面抗原
509   - private String HBeAbJ;//乙肝表面抗体
510   - private String HBeAgj;//乙肝e抗原
511   - private String HBsAbJ;//乙肝e抗体
512   - private String HBsAgJ;//乙肝核心抗体
  508 + private String hBcAbJ;//乙肝表面抗原
  509 + private String hBeAbJ;//乙肝表面抗体
  510 + private String hBeAgj;//乙肝e抗原
  511 + private String hBsAbJ;//乙肝e抗体
  512 + private String hBsAgJ;//乙肝核心抗体
513 513  
514 514 private String HIVJ;//人类免疫缺陷病毒抗体
515 515 private String tp;//梅毒螺旋体抗体
516 516  
517 517  
518 518  
519 519  
520 520  
521 521  
522 522  
523 523  
524 524  
... ... @@ -576,43 +576,43 @@
576 576 }
577 577  
578 578 public String getHBcAbJ() {
579   - return HBcAbJ;
  579 + return hBcAbJ;
580 580 }
581 581  
582   - public void setHBcAbJ(String HBcAbJ) {
583   - this.HBcAbJ = HBcAbJ;
  582 + public void setHBcAbJ(String hBcAbJ) {
  583 + this.hBcAbJ = hBcAbJ;
584 584 }
585 585  
586 586 public String getHBeAbJ() {
587   - return HBeAbJ;
  587 + return hBeAbJ;
588 588 }
589 589  
590   - public void setHBeAbJ(String HBeAbJ) {
591   - this.HBeAbJ = HBeAbJ;
  590 + public void setHBeAbJ(String hBeAbJ) {
  591 + this.hBeAbJ = hBeAbJ;
592 592 }
593 593  
594 594 public String getHBeAgj() {
595   - return HBeAgj;
  595 + return hBeAgj;
596 596 }
597 597  
598   - public void setHBeAgj(String HBeAgj) {
599   - this.HBeAgj = HBeAgj;
  598 + public void setHBeAgj(String hBeAgj) {
  599 + this.hBeAgj = hBeAgj;
600 600 }
601 601  
602 602 public String getHBsAbJ() {
603   - return HBsAbJ;
  603 + return hBsAbJ;
604 604 }
605 605  
606   - public void setHBsAbJ(String HBsAbJ) {
607   - this.HBsAbJ = HBsAbJ;
  606 + public void setHBsAbJ(String hBsAbJ) {
  607 + this.hBsAbJ = hBsAbJ;
608 608 }
609 609  
610 610 public String getHBsAgJ() {
611   - return HBsAgJ;
  611 + return hBsAgJ;
612 612 }
613 613  
614   - public void setHBsAgJ(String HBsAgJ) {
615   - this.HBsAgJ = HBsAgJ;
  614 + public void setHBsAgJ(String hBsAgJ) {
  615 + this.hBsAgJ = hBsAgJ;
616 616 }
617 617  
618 618 public String getHIVJ() {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java View file @ d59fb10
... ... @@ -8,6 +8,7 @@
8 8 import javax.servlet.http.HttpServletRequest;
9 9 import javax.servlet.http.HttpServletResponse;
10 10  
  11 +import com.lyms.platform.permission.model.LisReportQuery;
11 12 import org.apache.commons.collections.CollectionUtils;
12 13 import org.springframework.beans.factory.annotation.Autowired;
13 14 import org.springframework.beans.factory.annotation.Qualifier;
... ... @@ -113,8 +114,6 @@
113 114 }
114 115 return lisService.saveLisData(list,commonThreadPool);
115 116 }
116   -
117   -
118 117 @RequestMapping(method = RequestMethod.POST, value = "/saveLisDataTemp")
119 118 @ResponseBody
120 119 public Integer saveLisDataTemp(@RequestBody LisReportModel models,
... ... @@ -122,7 +121,6 @@
122 121  
123 122 return lisService.saveLisDataTemp(models);
124 123 }
125   -
126 124  
127 125 /**
128 126 * 获取lis和ris报告的接口
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientDtController.java View file @ d59fb10
... ... @@ -703,6 +703,7 @@
703 703 if (CollectionUtils.isNotEmpty(patientsList)){
704 704 appointmentModel.setIsBuild(1);
705 705 Patients patients= patientsList.get(0);
  706 + appointmentModel.setBookbuildingDate(patients.getBookbuildingDate());
706 707 PatientServiceQuery patientQuery = new PatientServiceQuery();
707 708 patientQuery.setParentid(patients.getId());
708 709 patientQuery.setSerType(1);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PredictedStatisticsFacade.java View file @ d59fb10
... ... @@ -141,7 +141,7 @@
141 141 patientsQuery.setBuildTypeNot(1);
142 142 for (int i = 0; i < 10; i++) {
143 143 Date temp = DateUtil.addMonth(date, i);
144   - System.out.println(temp);
  144 + // System.out.println(temp);
145 145 Date startDate = DateUtil.getMonthStart(temp);
146 146 Date endDate = DateUtil.getMonthEndTime(temp);
147 147 patientsQuery.setDueDateStart(startDate);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java View file @ d59fb10
... ... @@ -106,11 +106,11 @@
106 106 //产筛结果
107 107 private String nipt;//唐氏筛查/无创DNA检测
108 108 //传染病筛查
109   - private String HBcAbJ;//乙肝表面抗原
110   - private String HBeAbJ;//乙肝表面抗体
111   - private String HBeAgj;//乙肝e抗原
112   - private String HBsAbJ;//乙肝e抗体
113   - private String HBsAgJ;//乙肝核心抗体
  109 + private String hBcAbJ;//乙肝表面抗原
  110 + private String hBeAbJ;//乙肝表面抗体
  111 + private String hBeAgj;//乙肝e抗原
  112 + private String hBsAbJ;//乙肝e抗体
  113 + private String hBsAgJ;//乙肝核心抗体
114 114 private String HIVJ;//人类免疫缺陷病毒抗体
115 115 private String tp;//梅毒螺旋体抗体
116 116  
117 117  
118 118  
119 119  
120 120  
121 121  
122 122  
123 123  
124 124  
125 125  
... ... @@ -454,43 +454,43 @@
454 454 }
455 455  
456 456 public String getHBcAbJ() {
457   - return HBcAbJ;
  457 + return hBcAbJ;
458 458 }
459 459  
460 460 public void setHBcAbJ(String HBcAbJ) {
461   - this.HBcAbJ = HBcAbJ;
  461 + this.hBcAbJ = HBcAbJ;
462 462 }
463 463  
464 464 public String getHBeAbJ() {
465   - return HBeAbJ;
  465 + return hBeAbJ;
466 466 }
467 467  
468 468 public void setHBeAbJ(String HBeAbJ) {
469   - this.HBeAbJ = HBeAbJ;
  469 + this.hBeAbJ = HBeAbJ;
470 470 }
471 471  
472 472 public String getHBeAgj() {
473   - return HBeAgj;
  473 + return hBeAgj;
474 474 }
475 475  
476 476 public void setHBeAgj(String HBeAgj) {
477   - this.HBeAgj = HBeAgj;
  477 + this.hBeAgj = HBeAgj;
478 478 }
479 479  
480 480 public String getHBsAbJ() {
481   - return HBsAbJ;
  481 + return hBsAbJ;
482 482 }
483 483  
484 484 public void setHBsAbJ(String HBsAbJ) {
485   - this.HBsAbJ = HBsAbJ;
  485 + this.hBsAbJ = HBsAbJ;
486 486 }
487 487  
488 488 public String getHBsAgJ() {
489   - return HBsAgJ;
  489 + return hBsAgJ;
490 490 }
491 491  
492 492 public void setHBsAgJ(String HBsAgJ) {
493   - this.HBsAgJ = HBsAgJ;
  493 + this.hBsAgJ = HBsAgJ;
494 494 }
495 495  
496 496 public String getHIVJ() {