diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarBabyQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarBabyQuery.java index 71bd676..97a349e 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarBabyQuery.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarBabyQuery.java @@ -22,6 +22,7 @@ public class BabyPatientExtendEarBabyQuery extends BaseQuery { private String hospitalId; private Integer buildType; private String enable; + private String isEnable; private String noEnable; private Integer yn; private Date buildDate; @@ -39,6 +40,14 @@ public class BabyPatientExtendEarBabyQuery extends BaseQuery { */ private Date birthEnd; + public String getIsEnable() { + return isEnable; + } + + public void setIsEnable(String isEnable) { + this.isEnable = isEnable; + } + public String getPersonId() { return personId; } diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarBaby.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarBaby.xml index a215590..40635de 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarBaby.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarBaby.xml @@ -183,9 +183,10 @@ select id,name,sex,cardNo,birth,mname,mcert_type_id,mcert_no,mphone,vc_card_no,b and build_type = #{buildType,jdbcType=INTEGER} - and (enable = #{enable,jdbcType=VARCHAR} - or `enable` is null - ) + and enable = #{enable,jdbcType=VARCHAR} + + + and enable is null and (enable != #{noEnable,jdbcType=VARCHAR} 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 7030c07..8869c3e 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml @@ -594,8 +594,7 @@ select id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_ id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_left,oae_right,aabr_left,aabr_right,gjb2_del_35,gjb2_del_176,gjb2_del_235,gjb2_del_299,gjb3_slc26a4_538,gjb3_slc26a4_2168,gjb3_slc26a4_ivs7,rrna_1494,rrna_1555,process_option_type,process_option_desc,guid_opinion,check_doctor_id,referral_date,create_date,create_user_id,create_hospital_id,last_update_date,next_check_time,last_update_user_id,last_update_hospital_id,status,scr_ispass,pid from baby_patient_extend_ear_screen - (oae_left =-1 or oae_right = -1 or aabr_left = -1 or aabr_right = -1) - and screen_type = 2 + scr_ispass = 2 and select - ID,TARGET_TYPE,TARGET_ID,OUT_ORGID,INTO_ORGID,DESCRIPTION,MUSTDESC,RISK,CHANGEWAY,APPLY_DOCTORID,CREATE_ID,CHANGE_TYPE,STATUS,CREATE_TIME,RECEIVE_TIME,RECEIVE_DOCTORID,SCRREEN_ID + ID,TARGET_TYPE,TARGET_ID,OUT_ORGID,INTO_ORGID,DESCRIPTION,MUSTDESC,RISK,CHANGEWAY,APPLY_DOCTORID,CREATE_ID,CHANGE_TYPE,STATUS,CREATE_TIME,RECEIVE_TIME,RECEIVE_DOCTORID,SCRREEN_ID,pid from HIGHRISK_CHANGE_HOSPITAL diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/HdEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/HdEnums.java index 64482c8..d816bda 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/HdEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/HdEnums.java @@ -155,7 +155,7 @@ public class HdEnums { public enum SourceEnums { BY(1, "本院"), - ALL(3, "全部"), + // ALL(3, "全部"), WY(2, "外院"); private int id; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java index 96402e2..530dd30 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java @@ -297,8 +297,6 @@ public class EarController extends BaseController { BabyPatientExtendEarScreenQuery query = new BabyPatientExtendEarScreenQuery(); List babyIds = babyEarFacade.getBabyIdsByItemOrg(babyId, hospitalId); - - BabyModel babyModel = babyService.getOneBabyById(babyId); String pid = babyModel.getPid(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java index c3f41e3..c81a4c6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java @@ -354,10 +354,10 @@ public class HearingDiagnoseController extends BaseController { } else if (hdReq.getSource() == 1) {//1.本院 BabyPatientExtendEarBabyQuery babyQuery = new BabyPatientExtendEarBabyQuery(); babyQuery.setHospitalId(hospitalId); - babyQuery.setEnable("2"); + babyQuery.setIsEnable("1"); List earBabies = earBabyService.queryBabyPatientExtendEarBaby(babyQuery); for (BabyPatientExtendEarBaby eb:earBabies){ - pids.add(eb.getBabyPatientId()); + pids.add(eb.getPersonId()); } } } @@ -380,11 +380,17 @@ public class HearingDiagnoseController extends BaseController { } } - //主数据 + //本院听筛数据 List babyIds = screenService.queryScrBabyIds(scrQuery); BabyPatientExtendEarHearingDiagnoseQuery query = new BabyPatientExtendEarHearingDiagnoseQuery(); - query.setPids((String[]) pids.toArray(new String[pids.size()])); + if(CollectionUtils.isNotEmpty(pids)){ + query.setPids((String[]) pids.toArray(new String[pids.size()])); + } + if(CollectionUtils.isEmpty(pids)&&hdReq.getSource()!=null){ + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("没有找到要删除的数据"); + } + //设置要查询的babyId query.setHospitalId(hospitalId); if (hdReq.getDiagnoseStartTime() != 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 b431468..d16daa9 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 @@ -334,13 +334,14 @@ public class BabyEarFacade { babyPatientExtendEarBaby.setMphone(babyModel.getMphone()); babyPatientExtendEarBaby.setVcCardNo(babyModel.getVcCardNo()); babyPatientExtendEarBaby.setBuildDoctor(babyModel.getBuildDoctor()); - babyPatientExtendEarBaby.setHospitalId(babyModel.getHospitalId()); + babyPatientExtendEarBaby.setHospitalId(hospitalId); babyPatientExtendEarBaby.setBuildType(babyModel.getBuildType()); babyPatientExtendEarBaby.setYn(babyModel.getYn()); babyPatientExtendEarBaby.setBuildDate(babyModel.getBuildDate()); babyPatientExtendEarBaby.setEnable(babyModel.getEnable()); babyPatientExtendEarBaby.setBabyPatientId(babyModel.getId()); babyPatientExtendEarBaby.setBabyEarId(ear.getId()); + babyPatientExtendEarBaby.setPersonId(babyModel.getPid()); babyPatientExtendEarBabyService.addBabyPatientExtendEarBaby(babyPatientExtendEarBaby); } } @@ -475,6 +476,7 @@ public class BabyEarFacade { babyPatientExtendEar.setDischargeDiagnosis(babyEarBase.getDischargeDiagnosis()); babyPatientExtendEar.setHighRiskCause(babyEarBase.getHighRiskCause()); babyPatientExtendEar.setHighRiskCause(babyEarBase.getHighRiskCause()); + //根据babyId查询是否存 BabyPatientExtendEarQuery earQuery = new BabyPatientExtendEarQuery(); earQuery.setBabyPatientId(babyPatientId); @@ -496,6 +498,7 @@ public class BabyEarFacade { babyPatientExtendEar.setLastUpdateHospitalId(hId); babyPatientExtendEar.setLastUpdateUserId(userId + ""); babyPatientExtendEar.setBabyPatientId(babyPatientId); + babyPatientExtendEar.setStatus(YnEnums.YES.getId()); babyPatientExtendEarService.addBabyPatientExtendEar(babyPatientExtendEar); }