Commit 33fb67cf9aa5965903ae77f3119e1aace61560a5

Authored by zhangchao
1 parent d8fa5d3e94
Exists in dev

#fix:新增服务名目通知等功能

Showing 4 changed files with 57 additions and 0 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BloodSugarService.java View file @ 33fb67c
... ... @@ -3,6 +3,7 @@
3 3  
4 4 import com.lyms.platform.biz.dal.IBloodSugarDao;
5 5 import com.lyms.platform.common.dao.operator.MongoQuery;
  6 +import com.lyms.platform.common.enums.BloodSugarEnums;
6 7 import com.lyms.platform.pojo.BloodSugar;
7 8 import com.lyms.platform.pojo.CourseModel;
8 9 import com.lyms.platform.query.BloodSugarQuery;
9 10  
... ... @@ -23,10 +24,12 @@
23 24 private IBloodSugarDao bloodSugarDao;
24 25  
25 26 public void add(BloodSugar bloodSugar) {
  27 + bloodSugar.setSugarType(getBloodSugarStatus(bloodSugar.getBloodSugarType(), bloodSugar.getBloodSugar()));
26 28 bloodSugarDao.add(bloodSugar);
27 29 }
28 30  
29 31 public void update(BloodSugar bloodSugar) {
  32 + bloodSugar.setSugarType(getBloodSugarStatus(bloodSugar.getBloodSugarType(), bloodSugar.getBloodSugar()));
30 33 bloodSugarDao.updateXy(Query.query(Criteria.where("id").is(bloodSugar.getId())), bloodSugar);
31 34 }
32 35  
... ... @@ -38,6 +41,18 @@
38 41 query.start(bloodSugarQuery.getOffset()).end(bloodSugarQuery.getLimit());
39 42 }
40 43 return bloodSugarDao.queryBloodSugarList(query.addOrder(direction, sortField));
  44 + }
  45 +
  46 + private Integer getBloodSugarStatus(Integer type, String bloodSugar) {
  47 + if (type == BloodSugarEnums.A.getId()) {
  48 + return Double.parseDouble(bloodSugar) > 5.3D ? 3 : Double.parseDouble(bloodSugar) < 3.3D ? 2 : 1;
  49 + } else if (type == BloodSugarEnums.D.getId() || type == BloodSugarEnums.F.getId()) {
  50 + return Double.parseDouble(bloodSugar) > 5.3D ? 3 : Double.parseDouble(bloodSugar) < 3.3D ? 2 : 1;
  51 + } else if (type == BloodSugarEnums.H.getId()) {
  52 + return Double.parseDouble(bloodSugar) > 6.7D ? 3 : Double.parseDouble(bloodSugar) < 4.4D ? 2 : 1;
  53 + } else {
  54 + return Double.parseDouble(bloodSugar) > 6.7D ? 3 : Double.parseDouble(bloodSugar) < 4.4D ? 2 : 1;
  55 + }
41 56 }
42 57  
43 58 }
platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientServiceQuery.java View file @ 33fb67c
... ... @@ -28,6 +28,8 @@
28 28 private String createUser;
29 29 private Integer serStatus;
30 30 private Date updateDate;
  31 + private Date updateStartDate;
  32 + private Date updateEndDate;
31 33 private String updateUserName;
32 34 private String updateUser;
33 35 private String hospitalId;
... ... @@ -440,6 +442,22 @@
440 442  
441 443 public void setSerTypes(Integer[] serTypes) {
442 444 this.serTypes = serTypes;
  445 + }
  446 +
  447 + public Date getUpdateStartDate() {
  448 + return updateStartDate;
  449 + }
  450 +
  451 + public void setUpdateStartDate(Date updateStartDate) {
  452 + this.updateStartDate = updateStartDate;
  453 + }
  454 +
  455 + public Date getUpdateEndDate() {
  456 + return updateEndDate;
  457 + }
  458 +
  459 + public void setUpdateEndDate(Date updateEndDate) {
  460 + this.updateEndDate = updateEndDate;
443 461 }
444 462 }
platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml View file @ 33fb67c
... ... @@ -356,6 +356,18 @@
356 356 DATEDIFF(#{docEndTime},docEndTime)>=0
357 357 ]]>
358 358 </if>
  359 + <if test="updateStartDate !=null">
  360 + AND
  361 + <![CDATA[
  362 + update_date>= #{updateStartDate}
  363 + ]]>
  364 + </if>
  365 + <if test="updateEndDate !=null">
  366 + AND
  367 + <![CDATA[
  368 + update_date<= #{updateEndDate}
  369 + ]]>
  370 + </if>
359 371  
360 372 <if test="sql != null and sql != ''">
361 373 ${sql}
platform-dal/src/main/java/com/lyms/platform/pojo/BloodSugar.java View file @ 33fb67c
... ... @@ -80,6 +80,18 @@
80 80 * 是否打印过报告 1:已打印 2:未已打印
81 81 */
82 82 private Integer isPrint ;
  83 + /**
  84 + * 1正常血糖管理、2低血糖管理、3高血糖管理
  85 + */
  86 + private Integer sugarType;
  87 +
  88 + public Integer getSugarType() {
  89 + return sugarType;
  90 + }
  91 +
  92 + public void setSugarType(Integer sugarType) {
  93 + this.sugarType = sugarType;
  94 + }
83 95  
84 96 public Integer getIsPrint() {
85 97 return isPrint;