diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/LisReportItemModel.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/LisReportItemModel.java
index 16f56a9..254778f 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/LisReportItemModel.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/LisReportItemModel.java
@@ -5,7 +5,7 @@ package com.lyms.platform.permission.model;
*
*/
public class LisReportItemModel {
- private Integer id;
+// private Integer id;
// 检验报告ID
private String lisId;
// 项目代码
@@ -57,13 +57,6 @@ public class LisReportItemModel {
this.numberResult = numberResult;
}
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
public String getLisId() {
return lisId;
@@ -139,7 +132,7 @@ public class LisReportItemModel {
@Override
public String toString() {
- return "ListReportItemModel [id=" + id + ", lisId=" + lisId + ", code="
+ return "ListReportItemModel [lisId=" + lisId + ", code="
+ code + ", name=" + name + ", result=" + result
+ ", resultFlag=" + resultFlag + ", ref=" + ref
+ ", resultType=" + resultType + ", unit=" + unit
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml b/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml
index eb4f618..01e0aad 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml
@@ -102,13 +102,14 @@
MODIFIED AS modified,
CREATED AS created,
HOSPITAL_ID AS hospitalId,
- PHONE AS phone
+ PHONE AS phone,
+ ITEM_JSON AS itemJson
FROM LIS_REPORT_TBL
WHERE 1 = 1
AND LIS_ID = #{lisId}
-
+
AND (VCCARDNO = #{vcCardNo} OR PHONE = #{phone})
@@ -220,7 +221,11 @@
1 = 1
-
+
+ AND ID = #{id}
+
+
+
AND (VCCARDNO=#{vcCardNo} OR PHONE = #{phone})
diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
index 07db86e..c4d870e 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
@@ -1049,13 +1049,12 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
}
if (null != pv) {
- MongoCondition c = MongoCondition.newInstance();
- MongoCondition con1 = MongoCondition.newInstance("phone", pc[0], MongoOper.IS);
- MongoCondition con2 = MongoCondition.newInstance("vcCardNo", pc[1], MongoOper.IS);
- if(c1!=null) {
- c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2}).getCriteria());
- }else {
- c1 = c.orCondition(new MongoCondition[]{con1, con2}).getCriteria();
+ if (null != pv[0]) {
+ condition = condition.and("phone", pv[0], MongoOper.IS);
+ }
+
+ if (null != pv[1]) {
+ condition = condition.and("vcCardNo", pv[1], MongoOper.IS);
}
}
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java
index 5f73551..7912593 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java
@@ -298,6 +298,7 @@ public class LisFacade {
patientsQuery.setPid(patients.getPid());
patientsQuery.setVcCardNo(null);
patientsQuery.setHospitalId(null);
+ patientsQuery.setPv(null);
//通过上面就诊号查询到的人的所有建档记录 包括其他医院的建档记录
list= patientsService.queryPatient(patientsQuery);
@@ -348,7 +349,7 @@ public class LisFacade {
check.setApplyDateStr(DateUtil.getyyyy_MM_dd(lis.getPublishTime()));
check.setCheckDept(lis.getApplyDept());
check.setDoctor(lis.getApplyDoctor());
- check.setSex(check.getSex());
+ check.setSex(lis.getSex());
List itemList = new ArrayList<>();
@@ -434,7 +435,7 @@ public class LisFacade {
if (StringUtils.isNotEmpty(json))
{
List items = JsonUtil.toList(json, LisReportItemModel.class);
- lisReportModel.setItems(items.size() > 3 ? items.subList(0, 3) : items.subList(0,items.size()));
+ lisReportModel.setItems(items.size() > 3 ? items.subList(0, 4) : items.subList(0,items.size()));
lisReportModel.setItemJson(null);
}
}