diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreen.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreen.java
index ad3e829..913e7ea 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreen.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreen.java
@@ -116,6 +116,7 @@ public class BabyPatientExtendEarScreen extends AbstracUuidEntity {
private Date lastUpdateDate;
private String lastUpdateUserId;
private String lastUpdateHospitalId;
+ //0-正常 1-删除
private Integer status;
public String getPid() {
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml
index 2eef4b3..ee04ab9 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml
@@ -464,6 +464,9 @@ select id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_
DATEDIFF(#{nextEndTime},next_check_time) >=0
]]>
+
+ and status = #{status,jdbcType=INTEGER}
+
@@ -610,6 +613,9 @@ select id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_
and check_doctor_id = #{checkDoctorId}
+
+ and status = #{status,jdbcType=INTEGER}
+
and pid = #{pid}
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java
index b5c23c2..42e0745 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java
@@ -517,6 +517,7 @@ public class HearDiagnManageController extends BaseController {
if (model.getDiagnDoctorId() != null) {
screenQuery.setCheckDoctorId(model.getDiagnDoctorId());
}
+ screenQuery.setStatus(0);
//查询全部数据
List earScreens = screenService.dubiousScreen(screenQuery);
@@ -937,6 +938,7 @@ public class HearDiagnManageController extends BaseController {
screenQuery.setCheckDoctorId(model.getDiagnDoctorId());
}
screenQuery.setCheckHospitalId(hospitalId);
+ screenQuery.setStatus(0);
//根据儿童条件查询如果为空
if (CollectionUtils.isEmpty(babyIds) && (model.getMonthAgeStart() != null || model.getMonthAgeEnd() != null || StringUtils.isNotEmpty(model.getKeyWord()) || model.getBirthStartTime() != null || model.getBirthEndTime() != null)) {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java
index 309d3b2..3510364 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java
@@ -1469,7 +1469,7 @@ public class BabyEarFacade {
/**
- * 删除儿童听筛记录
+ * 删除儿童档案
*
* @param babyEarId 儿童听筛id
* @return
@@ -1671,7 +1671,7 @@ public class BabyEarFacade {
/**
- * 刪除听筛
+ * 删除听筛
*
* @return
*/
@@ -1809,6 +1809,7 @@ public class BabyEarFacade {
//当前登录人医院Id
String hospitalId = autoMatchFacade.getHospitalId(userId);
screenQuery.setCheckHospitalId(hospitalId);
+ screenQuery.setStatus(0);
//如果查询号不为空,根据查询号查询儿童档案表,获取儿童档案Id
if (StringUtils.isNotEmpty(earScreenListRequest.getKeyWord()) || earScreenListRequest.getBirthStartTime() != null || earScreenListRequest.getBirthEndTime() != null) {//关键字:姓名、联系方式、就诊卡 查询babyId