From bd77f63baa43afeda812cb14b2a8d475f9215753 Mon Sep 17 00:00:00 2001 From: yangfei Date: Fri, 25 Aug 2017 15:29:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=AC=E5=8A=9B=E8=AF=8A=E6=96=AD=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/BabyPatientExtendEarBirth.java | 6 +-- .../mainOrm/master/BabyPatientExtendEarBirth.xml | 10 ++-- .../mainOrm/master/BabyPatientExtendEarScreen.xml | 7 +++ .../com/lyms/platform/query/BabyModelQuery.java | 59 ++++++++++------------ .../operate/web/controller/EarController.java | 25 ++++++--- .../platform/operate/web/facade/BabyEarFacade.java | 38 ++++++++++---- 6 files changed, 88 insertions(+), 57 deletions(-) diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarBirth.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarBirth.java index 65926d0..ceba603 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarBirth.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarBirth.java @@ -90,7 +90,7 @@ public class BabyPatientExtendEarBirth { /** * 异常分娩部位 1=臀部 2=脐带绕颈 3=胎膜早破 */ - private Integer abnormalParturitionPosition; + private String abnormalParturitionPosition; /** * 头颅、五观是否畸形 1=有 -1=无 @@ -310,11 +310,11 @@ public class BabyPatientExtendEarBirth { this.abnormalParturitionType = abnormalParturitionType; } - public Integer getAbnormalParturitionPosition() { + public String getAbnormalParturitionPosition() { return abnormalParturitionPosition; } - public void setAbnormalParturitionPosition(Integer abnormalParturitionPosition) { + public void setAbnormalParturitionPosition(String abnormalParturitionPosition) { this.abnormalParturitionPosition = abnormalParturitionPosition; } diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarBirth.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarBirth.xml index e5f38f7..0c15cca 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarBirth.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarBirth.xml @@ -19,7 +19,7 @@ - + @@ -97,8 +97,8 @@ insert into baby_patient_extend_ear_birth (id,fetu_number,product_number,birth_w abnormal_parturition_type = #{abnormalParturitionType,jdbcType=INTEGER}, - - abnormal_parturition_position = #{abnormalParturitionPosition,jdbcType=INTEGER}, + + abnormal_parturition_position = #{abnormalParturitionPosition,jdbcType=VARCHAR}, deformity_type = #{deformityType,jdbcType=INTEGER}, @@ -241,8 +241,8 @@ select id,fetu_number,product_number,birth_weight,parturition_type,birth_defect_ and abnormal_parturition_type = #{abnormalParturitionType,jdbcType=INTEGER} - - and abnormal_parturition_position = #{abnormalParturitionPosition,jdbcType=INTEGER} + + and abnormal_parturition_position = #{abnormalParturitionPosition,jdbcType=VARCHAR} and deformity_type = #{deformityType,jdbcType=INTEGER} 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 a19d68c..745a7a4 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml @@ -316,6 +316,13 @@ select id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_ and check_doctor_id = #{checkDoctorId} + + and check_hospital_id in + + #{item} + + + and baby_id in ( diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java index 2d4ec03..c5cf09a 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java @@ -163,7 +163,6 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { private Boolean isNull; - public Integer[] getOrServiceStatus() { return orServiceStatus; } @@ -630,7 +629,7 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { if (null != hospitalIdList) { condition = condition.and("hospitalId", hospitalIdList, MongoOper.IN); - }else if (null != hospitalId) { + } else if (null != hospitalId) { condition = condition.and("hospitalId", hospitalId, MongoOper.IS); } if (!StringUtils.isEmpty(lastDiagnose)) { @@ -660,13 +659,13 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { condition = condition.and("buildType", smsBuildTypeList, MongoOper.IN); } - if (StringUtils.isNotEmpty(queryNo)){ + if (StringUtils.isNotEmpty(queryNo)) { MongoCondition c = MongoCondition.newInstance(); MongoCondition con1 = MongoCondition.newInstance("mname", queryNo, MongoOper.LIKE); MongoCondition con2 = MongoCondition.newInstance("mcertNo", queryNo, MongoOper.IS); MongoCondition con3 = MongoCondition.newInstance("mphone", queryNo, MongoOper.IS); MongoCondition con4 = MongoCondition.newInstance("name", queryNo, MongoOper.LIKE); - condition = condition.andCondition(c.orCondition(new MongoCondition[]{con1, con2, con3,con4})); + condition = condition.andCondition(c.orCondition(new MongoCondition[]{con1, con2, con3, con4})); } if (null != sex) { @@ -726,38 +725,11 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { condition = condition.and("expVip", expVip, MongoOper.IS); } - Criteria c = null; if (null != birthStart) { c = Criteria.where("birth").gte(birthStart); } - if (null != nextDateStart && nextDateEnd != null) { - - Criteria cr = Criteria.where("nextDate").gte(nextDateStart).lte(nextDateEnd); - condition.andCondition(new MongoCondition(cr)); - - } - - - if (null != phoneOrcardNo) { - MongoCondition c1 = MongoCondition.newInstance(); - MongoCondition con1 = MongoCondition.newInstance("mphone", phoneOrcardNo, MongoOper.IS); - MongoCondition con2 = MongoCondition.newInstance("mcertNo", phoneOrcardNo, MongoOper.IS); - if(c!=null) { - c = c.andOperator(c1.orCondition(new MongoCondition[]{con1, con2}).getCriteria()); - }else { - c = c1.orCondition(new MongoCondition[]{con1, con2}).getCriteria(); - } - } - - - if (null != gteModified && null != gteCreated) { - MongoCondition mongoCondition = new MongoCondition("modified", gteModified, MongoOper.GTE); - MongoCondition condition2 = new MongoCondition("created", gteCreated, MongoOper.GTE); - condition = condition.orCondition(new MongoCondition[]{mongoCondition, condition2}); - } - if (null != birthEnd) { if (null != c) { c = c.lte(birthEnd); @@ -783,6 +755,31 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { } } + if (null != nextDateStart && nextDateEnd != null) { + Criteria cr = Criteria.where("nextDate").gte(nextDateStart).lte(nextDateEnd); + condition.andCondition(new MongoCondition(cr)); + } + + + if (null != phoneOrcardNo) { + MongoCondition c1 = MongoCondition.newInstance(); + MongoCondition con1 = MongoCondition.newInstance("mphone", phoneOrcardNo, MongoOper.IS); + MongoCondition con2 = MongoCondition.newInstance("mcertNo", phoneOrcardNo, MongoOper.IS); + if (c != null) { + c = c.andOperator(c1.orCondition(new MongoCondition[]{con1, con2}).getCriteria()); + } else { + c = c1.orCondition(new MongoCondition[]{con1, con2}).getCriteria(); + } + } + + + if (null != gteModified && null != gteCreated) { + MongoCondition mongoCondition = new MongoCondition("modified", gteModified, MongoOper.GTE); + MongoCondition condition2 = new MongoCondition("created", gteCreated, MongoOper.GTE); + condition = condition.orCondition(new MongoCondition[]{mongoCondition, condition2}); + } + + if (c != null) { return new MongoCondition(c.andOperator(condition.getCriteria())).toMongoQuery(); } 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 ced467e..34b4fd2 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 @@ -263,14 +263,23 @@ public class EarController extends BaseController { } else { boolean isResu = false; for (BabyPatientExtendEarScreen scr : screenList) { - if(scr.getOaeRight()==null||scr.getOaeLeft()==null||scr.getAabrLeft()==null||scr.getAabrRight()==null){ - - }else - //只要有听筛未通过的就可以进入听诊了 - if (scr.getOaeLeft() == -1 || scr.getOaeRight() == -1 || scr.getAabrLeft() == -1 || scr.getAabrRight() == -1) {//1=通过 -1=未通过 - isResu = true; - break; - } + if (scr.getOaeRight() == null) { + scr.setOaeRight(1); + } + if (scr.getOaeLeft() == null) { + scr.setOaeLeft(1); + } + if (scr.getAabrLeft() == null) { + scr.setAabrLeft(1); + } + if (scr.getAabrRight() == null) { + scr.setAabrRight(1); + } + //只要有听筛未通过的就可以进入听诊了 + if (scr.getOaeLeft() == -1 || scr.getOaeRight() == -1 || scr.getAabrLeft() == -1 || scr.getAabrRight() == -1) {//1=通过 -1=未通过 + isResu = true; + break; + } } if (!isResu) { return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_POWER).setErrormsg("听诊诊断失败，儿童听筛已通过"); 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 1f9642f..c32e572 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 @@ -1049,15 +1049,32 @@ public class BabyEarFacade { String parturitType = "无"; if (babyPatientExtendEarBirth.getAbnormalParturitionType() != null) { if (babyPatientExtendEarBirth.getAbnormalParturitionType() == 1) {//有 - parturitType = "有"; - if (babyPatientExtendEarBirth.getAbnormalParturitionPosition() != null) {//异常分娩部位 1=臀部 2=脐带绕颈 3=胎膜早破 - if (babyPatientExtendEarBirth.getAbnormalParturitionPosition() == 1) { - parturitType = "有(臀部)"; - } else if (babyPatientExtendEarBirth.getAbnormalParturitionPosition() == 2) { - parturitType = "有(脐带绕颈)"; - } else if (babyPatientExtendEarBirth.getAbnormalParturitionPosition() == 3) { - parturitType = "有(胎膜早破)"; + parturitType = "有("; + if (StringUtils.isNotEmpty(babyPatientExtendEarBirth.getAbnormalParturitionPosition())) {//异常分娩部位 1=臀部 2=脐带绕颈 3=胎膜早破 + JSONObject positionJo = JSONObject.parseObject(babyPatientExtendEarBirth.getAbnormalParturitionPosition()); + if(positionJo.containsKey("tw")){ + if(positionJo.getBoolean("tw")){ + parturitType+="臀部、"; + } + } + if(positionJo.containsKey("qdrj")){ + if(positionJo.getBoolean("qdrj")){ + parturitType+="脐带绕颈、"; + } } + if(positionJo.containsKey("tmzp")){ + if(positionJo.getBoolean("tmzp")){ + parturitType+="胎膜早破、"; + } + } + parturitType+=")"; + // if (babyPatientExtendEarBirth.getAbnormalParturitionPosition() == 1) { + // parturitType = "有(臀部)"; + // } else if (babyPatientExtendEarBirth.getAbnormalParturitionPosition() == 2) { + // parturitType = "有(脐带绕颈)"; + // } else if (babyPatientExtendEarBirth.getAbnormalParturitionPosition() == 3) { + // parturitType = "有(胎膜早破)"; + // } } } } @@ -1550,6 +1567,7 @@ public class BabyEarFacade { babyQuery.setQueryNo(earScreenListRequest.getKeyWord()); babyQuery.setBirthStart(earScreenListRequest.getBirthStartTime()); babyQuery.setBirthEnd(earScreenListRequest.getBirthEndTime()); + babyQuery.setHospitalId(hospitalId); //查询建档记录 List models = babyBookbuildingService.queryBabyBuildByCond(babyQuery); if (CollectionUtils.isNotEmpty(models)) { @@ -1591,10 +1609,10 @@ public class BabyEarFacade { screenResult.setHighRiskCause(hfBuff.toString()); } String srcResult = "通过"; - if (earScreen.getAabrLeft() != null && earScreen.getAabrLeft() == -1 && earScreen.getOaeLeft() != null && earScreen.getOaeLeft() == -1) { + if ((earScreen.getAabrLeft() != null && earScreen.getAabrLeft() == -1 )|| (earScreen.getOaeLeft() != null && earScreen.getOaeLeft() == -1)) { srcResult = "不通过"; } - if (earScreen.getOaeRight() != null && earScreen.getOaeRight() == -1 && earScreen.getAabrRight() != null && earScreen.getAabrRight() == -1) { + if ((earScreen.getOaeRight() != null && earScreen.getOaeRight() == -1)|| (earScreen.getAabrRight() != null && earScreen.getAabrRight() == -1)) { srcResult = "不通过"; } screenResult.setSrcResult(srcResult); -- 1.8.3.1