diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BloodSugarService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BloodSugarService.java
index cf85ca6..150bbbb 100644
--- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BloodSugarService.java
+++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BloodSugarService.java
@@ -3,6 +3,7 @@ package com.lyms.platform.biz.service;
import com.lyms.platform.biz.dal.IBloodSugarDao;
import com.lyms.platform.common.dao.operator.MongoQuery;
+import com.lyms.platform.common.enums.BloodSugarEnums;
import com.lyms.platform.pojo.BloodSugar;
import com.lyms.platform.pojo.CourseModel;
import com.lyms.platform.query.BloodSugarQuery;
@@ -23,10 +24,12 @@ public class BloodSugarService {
private IBloodSugarDao bloodSugarDao;
public void add(BloodSugar bloodSugar) {
+ bloodSugar.setSugarType(getBloodSugarStatus(bloodSugar.getBloodSugarType(), bloodSugar.getBloodSugar()));
bloodSugarDao.add(bloodSugar);
}
public void update(BloodSugar bloodSugar) {
+ bloodSugar.setSugarType(getBloodSugarStatus(bloodSugar.getBloodSugarType(), bloodSugar.getBloodSugar()));
bloodSugarDao.updateXy(Query.query(Criteria.where("id").is(bloodSugar.getId())), bloodSugar);
}
@@ -40,4 +43,16 @@ public class BloodSugarService {
return bloodSugarDao.queryBloodSugarList(query.addOrder(direction, sortField));
}
+ private Integer getBloodSugarStatus(Integer type, String bloodSugar) {
+ if (type == BloodSugarEnums.A.getId()) {
+ return Double.parseDouble(bloodSugar) > 5.3D ? 3 : Double.parseDouble(bloodSugar) < 3.3D ? 2 : 1;
+ } else if (type == BloodSugarEnums.D.getId() || type == BloodSugarEnums.F.getId()) {
+ return Double.parseDouble(bloodSugar) > 5.3D ? 3 : Double.parseDouble(bloodSugar) < 3.3D ? 2 : 1;
+ } else if (type == BloodSugarEnums.H.getId()) {
+ return Double.parseDouble(bloodSugar) > 6.7D ? 3 : Double.parseDouble(bloodSugar) < 4.4D ? 2 : 1;
+ } else {
+ return Double.parseDouble(bloodSugar) > 6.7D ? 3 : Double.parseDouble(bloodSugar) < 4.4D ? 2 : 1;
+ }
+ }
+
}
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientServiceQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientServiceQuery.java
index 279bc91..9983fb4 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientServiceQuery.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientServiceQuery.java
@@ -28,6 +28,8 @@ public class PatientServiceQuery extends BaseQuery {
private String createUser;
private Integer serStatus;
private Date updateDate;
+ private Date updateStartDate;
+ private Date updateEndDate;
private String updateUserName;
private String updateUser;
private String hospitalId;
@@ -441,4 +443,20 @@ public class PatientServiceQuery extends BaseQuery {
public void setSerTypes(Integer[] serTypes) {
this.serTypes = serTypes;
}
+
+ public Date getUpdateStartDate() {
+ return updateStartDate;
+ }
+
+ public void setUpdateStartDate(Date updateStartDate) {
+ this.updateStartDate = updateStartDate;
+ }
+
+ public Date getUpdateEndDate() {
+ return updateEndDate;
+ }
+
+ public void setUpdateEndDate(Date updateEndDate) {
+ this.updateEndDate = updateEndDate;
+ }
}
\ No newline at end of file
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml b/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml
index 0eb97ea..4ce6892 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml
@@ -356,6 +356,18 @@
DATEDIFF(#{docEndTime},docEndTime)>=0
]]>
+
+ AND
+ = #{updateStartDate}
+ ]]>
+
+
+ AND
+
+
${sql}
diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BloodSugar.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BloodSugar.java
index bf871fd..2545fa4 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/BloodSugar.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BloodSugar.java
@@ -80,6 +80,18 @@ public class BloodSugar extends BaseModel {
* 是否打印过报告 1:已打印 2:未已打印
*/
private Integer isPrint ;
+ /**
+ * 1正常血糖管理、2低血糖管理、3高血糖管理
+ */
+ private Integer sugarType;
+
+ public Integer getSugarType() {
+ return sugarType;
+ }
+
+ public void setSugarType(Integer sugarType) {
+ this.sugarType = sugarType;
+ }
public Integer getIsPrint() {
return isPrint;