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 6093acd..6a35b3a 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 @@ -29,7 +29,7 @@ public class BabyPatientExtendEarScreen extends AbstracUuidEntity { private Date screenDate; /** - * 高危因素 1=早产 2=晚产 + * 听力高危因素 */ private Integer highRiskCause; @@ -68,6 +68,10 @@ public class BabyPatientExtendEarScreen extends AbstracUuidEntity { private Integer gjb3Slc26a4Ivs7; + private Integer rrna1494; + + private Integer rrna1555; + /** * 处理意见 1=复筛 2=诊断 */ @@ -101,6 +105,22 @@ public class BabyPatientExtendEarScreen extends AbstracUuidEntity { private String lastUpdateHospitalId; private Integer status; + public Integer getRrna1494() { + return rrna1494; + } + + public void setRrna1494(Integer rrna1494) { + this.rrna1494 = rrna1494; + } + + public Integer getRrna1555() { + return rrna1555; + } + + public void setRrna1555(Integer rrna1555) { + this.rrna1555 = rrna1555; + } + public Integer getAabrLeft() { return aabrLeft; } 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 9675caf..8f218da 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml @@ -21,6 +21,8 @@ + + @@ -38,7 +40,7 @@ -insert into baby_patient_extend_ear_screen (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,process_option_type,process_option_desc,guid_opinion,check_doctor_id,referral_date,create_date,create_user_id,create_hospital_id,last_update_date,last_update_user_id,last_update_hospital_id,status) values (#{id},#{babyId},#{screenType},#{checkHospitalId},#{screenDate},#{highRiskCause},#{oaeLeft},#{oaeRight},#{aabrLeft},#{aabrRight},#{gjb2Del35},#{gjb2Del176},#{gjb2Del235},#{gjb2Del299},#{gjb3Slc26a4538},#{gjb3Slc26a42168},#{gjb3Slc26a4Ivs7},#{processOptionType},#{processOptionDesc},#{guidOpinion},#{checkDoctorId},#{referralDate},#{createDate},#{createUserId},#{createHospitalId},#{lastUpdateDate},#{lastUpdateUserId},#{lastUpdateHospitalId},#{status}) +insert into baby_patient_extend_ear_screen (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,last_update_user_id,last_update_hospital_id,status) values (#{id},#{babyId},#{screenType},#{checkHospitalId},#{screenDate},#{highRiskCause},#{oaeLeft},#{oaeRight},#{aabrLeft},#{aabrRight},#{gjb2Del35},#{gjb2Del176},#{gjb2Del235},#{gjb2Del299},#{gjb3Slc26a4538},#{gjb3Slc26a42168},#{gjb3Slc26a4Ivs7},{rrna1494},{rrna1555},#{processOptionType},#{processOptionDesc},#{guidOpinion},#{checkDoctorId},#{referralDate},#{createDate},#{createUserId},#{createHospitalId},#{lastUpdateDate},#{lastUpdateUserId},#{lastUpdateHospitalId},#{status}) @@ -94,6 +96,12 @@ insert into baby_patient_extend_ear_screen (id,baby_id,screen_type,check_hospita gjb3_slc26a4_ivs7 = #{gjb3Slc26a4Ivs7,jdbcType=INTEGER}, + + rrna_1494 = #{rrna1494,jdbcType=INTEGER}, + + + rrna_1555 = #{rrna1555,jdbcType=INTEGER}, + process_option_type = #{processOptionType,jdbcType=INTEGER}, @@ -142,7 +150,7 @@ delete from baby_patient_extend_ear_screen where id = #{id,jdbcType=VARCHAR} @@ -276,7 +284,7 @@ select id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_ select - 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,process_option_type,process_option_desc,guid_opinion,check_doctor_id,referral_date,create_date,create_user_id,create_hospital_id,last_update_date,last_update_user_id,last_update_hospital_id,status + 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,last_update_user_id,last_update_hospital_id,status from baby_patient_extend_ear_screen (oae_left =-1 or oae_right = -1 or aabr_left = -1 or aabr_right = -1) diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/BabyEarResultEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/BabyEarResultEnums.java index 6fd2b1f..b16c273 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/BabyEarResultEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/BabyEarResultEnums.java @@ -9,7 +9,7 @@ package com.lyms.platform.common.enums; */ public enum BabyEarResultEnums { - PASS(1,"通過"),UNPASS(2,"不通過");; + PASS(1,"通过"),UNPASS(2,"不通过");; private BabyEarResultEnums(Integer id,String title){ this.id =id; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEarController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEarController.java index e9851aa..0018b96 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEarController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEarController.java @@ -11,10 +11,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; @@ -43,14 +40,19 @@ public class BabyEarController extends BaseController @Autowired private BabyEarFacade babyEarFacade; + /** + * 听筛建档初始化数据 + * @return + */ @ResponseBody @RequestMapping(method = RequestMethod.GET,value = "/babyear/init") public BaseResponse babyEarInit(){ return babyEarFacade.babyEarInit(); } + /** - * 增加儿童听力筛查 + * 听力筛查建档 * * @param babyEarAddRequest 儿童听筛请求对象 * @@ -68,7 +70,7 @@ public class BabyEarController extends BaseController /** * 删除儿童听力筛查 */ - @RequestMapping(value = "/babyear",method = RequestMethod.DELETE) + @RequestMapping(value = "/babyear",method = RequestMethod.DELETE) @ResponseBody @TokenRequired public BaseResponse delOneBabyEar(@RequestParam("id")String id){ @@ -76,7 +78,7 @@ public class BabyEarController extends BaseController } /** - * 查看儿童听筛详情 + * 查看儿童听筛建档 * * @return */ @@ -88,7 +90,7 @@ public class BabyEarController extends BaseController } /** - * 增加或者修改产晒接口 + * 增加或者修改听筛 * * @param babyScreenAddRequest * @param httpServletRequest @@ -104,7 +106,7 @@ public class BabyEarController extends BaseController } /** - * 删除产晒记录 + * 删除听筛记录 * * @param id * @return @@ -118,7 +120,19 @@ public class BabyEarController extends BaseController } /** - * 获取产晒记录 + * 根据儿童Id获取听筛记录 + * + * @param babyId + * @return + */ + @RequestMapping(value = "/babyearsrc/{babyId}",method = RequestMethod.GET) + @ResponseBody + @TokenRequired + public BaseResponse getBabyIdBabySrc(@PathVariable("babyId")String babyId){ + return babyEarFacade.findBabyEarSrc(babyId); + } + /** + * 获取听筛记录 * * @param id * @return 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 0583e4d..c892619 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 @@ -11,10 +11,7 @@ import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.EnumUtil; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.facade.AutoMatchFacade; -import com.lyms.platform.operate.web.result.InitFollowUp; -import com.lyms.platform.operate.web.result.InitFollowUpListData; -import com.lyms.platform.operate.web.result.InitHearingDiagnose; -import com.lyms.platform.operate.web.result.InitHearingDiagnoseListData; +import com.lyms.platform.operate.web.result.*; import com.lyms.platform.permission.model.*; import com.lyms.platform.permission.service.*; import org.apache.commons.collections.CollectionUtils; @@ -124,6 +121,21 @@ public class EarController extends BaseController { } /** + * 进入新增听筛初始化数据 + * + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/initScreen") + @ResponseBody + @TokenRequired + public BaseResponse initScreen() { + //根据条件查询基础配置信息表 + InitScreen initScreen = new InitScreen(); + initScreen.setHighRiskConfirms(EnumUtil.toJson(HighRiskEnum.class)); + initScreen.setDeafEnumsResult(EnumUtil.toJson(DeafEnums.class)); + return initScreen.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功"); + } + /** * 进入新增随访记录页面前，验证及初始化数据 * * @return 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 bc6f608..4c0dfe4 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 @@ -338,29 +338,71 @@ public class BabyEarFacade { return baseObjectResponse; } + /** + * 根据儿童id查询听力筛查记录 + * + * @param babyId 听力筛查id + * @return + */ + public BaseResponse findBabyEarSrc(String babyId) { + BabyPatientExtendEarScreenQuery query = new BabyPatientExtendEarScreenQuery(); + query.setBabyId(babyId); + List babyPatientExtendEarScreens = babyPatientExtendEarScreenService.queryBabyPatientExtendEarScreen(query); + + + List> list = new ArrayList<>(); + for (BabyPatientExtendEarScreen hd : babyPatientExtendEarScreens) { + Map fuMap = new HashMap<>(); + fuMap.put("id", hd.getId()); + fuMap.put("type", hd.getScreenType() == 1 ? "初筛" : "复筛"); + fuMap.put("hospitalId", hd.getCheckHospitalId()); + fuMap.put("scrTime", DateUtil.getyyyy_MM_dd(hd.getScreenDate())); + list.add(fuMap); + } + BaseResponse result = new BaseResponse(); + result.setObject(list); + result.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功"); + return result; + } + public Map buildBabyEarResult(BabyPatientExtendEarScreen babyPatientExtendEarScreen) { - Map data = new HashMap<>(); + Map data = new HashMap<>(); data.put("id", babyPatientExtendEarScreen.getId()); data.put("babyId", babyPatientExtendEarScreen.getBabyId()); data.put("screenType", babyPatientExtendEarScreen.getScreenType() == 1 ? "初筛" : "复筛");//1= 2= data.put("checkHospitalId", babyPatientExtendEarScreen.getCheckHospitalId()); data.put("checkHospital", organizationService.getOrganization(Integer.valueOf(babyPatientExtendEarScreen.getCheckHospitalId())).getName()); data.put("screenDate", DateUtil.getYmd(babyPatientExtendEarScreen.getScreenDate())); - data.put("highRiskCause", HighRiskEnum.getTitle(babyPatientExtendEarScreen.getHighRiskCause())); - data.put("oaeLeft", BabyEarResultEnums.getTitle(babyPatientExtendEarScreen.getOaeLeft())); - data.put("oaeRight", BabyEarResultEnums.getTitle(babyPatientExtendEarScreen.getOaeRight())); - data.put("aabrLeft", BabyEarResultEnums.getTitle(babyPatientExtendEarScreen.getAabrLeft())); - data.put("aabrRight", BabyEarResultEnums.getTitle(babyPatientExtendEarScreen.getAabrRight())); - data.put("gjb2Del35", DeafEnums.getTitle(babyPatientExtendEarScreen.getGjb2Del35())); - data.put("gjb2Del176", DeafEnums.getTitle(babyPatientExtendEarScreen.getGjb2Del176())); - data.put("gjb2Del235", DeafEnums.getTitle(babyPatientExtendEarScreen.getGjb2Del235())); - - data.put("gjb2Del299", DeafEnums.getTitle(babyPatientExtendEarScreen.getGjb2Del299())); - data.put("gjb3Slc26a4538", DeafEnums.getTitle(babyPatientExtendEarScreen.getGjb3Slc26a4538())); - data.put("gjb3Slc26a42168", DeafEnums.getTitle(babyPatientExtendEarScreen.getGjb3Slc26a42168())); - - data.put("gjb3Slc26a4Ivs7", DeafEnums.getTitle(babyPatientExtendEarScreen.getGjb3Slc26a4Ivs7())); - data.put("processOptionType", babyPatientExtendEarScreen.getProcessOptionType() == 1 ? "复筛" : "诊断");//1=复筛 2=诊断 + data.put("highRiskCause", babyPatientExtendEarScreen.getHighRiskCause()); + data.put("highRiskCauseStr", HighRiskEnum.getTitle(babyPatientExtendEarScreen.getHighRiskCause()==null?0:babyPatientExtendEarScreen.getHighRiskCause())); + data.put("oaeLeft", babyPatientExtendEarScreen.getOaeLeft()); + data.put("oaeLeftStr", BabyEarResultEnums.getTitle(babyPatientExtendEarScreen.getOaeLeft()==null?0:babyPatientExtendEarScreen.getOaeLeft())); + data.put("oaeRight", babyPatientExtendEarScreen.getOaeRight()); + data.put("oaeRightStr", BabyEarResultEnums.getTitle(babyPatientExtendEarScreen.getOaeRight()==null?0:babyPatientExtendEarScreen.getOaeRight())); + data.put("aabrLeft", babyPatientExtendEarScreen.getAabrLeft()); + data.put("aabrLeftStr", BabyEarResultEnums.getTitle(babyPatientExtendEarScreen.getAabrLeft()==null?0:babyPatientExtendEarScreen.getAabrLeft())); + data.put("aabrRight", babyPatientExtendEarScreen.getAabrRight()); + data.put("aabrRightStr", BabyEarResultEnums.getTitle(babyPatientExtendEarScreen.getAabrRight()==null?0:babyPatientExtendEarScreen.getAabrRight())); + data.put("gjb2Del35", babyPatientExtendEarScreen.getGjb2Del35()); + data.put("gjb2Del35Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getGjb2Del35()==null?0:babyPatientExtendEarScreen.getGjb2Del35())); + data.put("gjb2Del176", babyPatientExtendEarScreen.getGjb2Del176()); + data.put("gjb2Del176Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getGjb2Del176()==null?0:babyPatientExtendEarScreen.getGjb2Del176())); + data.put("gjb2Del235", babyPatientExtendEarScreen.getGjb2Del235()); + data.put("gjb2Del235Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getGjb2Del235()==null?0:babyPatientExtendEarScreen.getGjb2Del235())); + data.put("gjb2Del299", babyPatientExtendEarScreen.getGjb2Del299()); + data.put("gjb2Del299Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getGjb2Del299()==null?0:babyPatientExtendEarScreen.getGjb2Del299())); + data.put("gjb3Slc26a4538", babyPatientExtendEarScreen.getGjb3Slc26a4538()); + data.put("gjb3Slc26a4538Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getGjb3Slc26a4538()==null?0:babyPatientExtendEarScreen.getGjb3Slc26a4538())); + data.put("gjb3Slc26a42168", babyPatientExtendEarScreen.getGjb3Slc26a42168()); + data.put("gjb3Slc26a42168Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getGjb3Slc26a42168()==null?0:babyPatientExtendEarScreen.getGjb3Slc26a42168())); + data.put("gjb3Slc26a4Ivs7", babyPatientExtendEarScreen.getGjb3Slc26a4Ivs7()); + data.put("gjb3Slc26a4Ivs7Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getGjb3Slc26a4Ivs7()==null?0:babyPatientExtendEarScreen.getGjb3Slc26a4Ivs7())); + data.put("rrna1494", babyPatientExtendEarScreen.getRrna1494()); + data.put("rrna1494Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getRrna1494()==null?0:babyPatientExtendEarScreen.getRrna1494())); + data.put("rrna1555", babyPatientExtendEarScreen.getRrna1555()); + data.put("rrna1555Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getRrna1555()==null?0:babyPatientExtendEarScreen.getRrna1555())); + data.put("processOptionType", babyPatientExtendEarScreen.getProcessOptionType());//1=复筛 2=诊断 + data.put("processOptionTypeStr", babyPatientExtendEarScreen.getProcessOptionType()==null?"初诊":babyPatientExtendEarScreen.getProcessOptionType() == 1 ? "复筛" : "诊断");//1=复筛 2=诊断 data.put("processOptionDesc", babyPatientExtendEarScreen.getProcessOptionDesc()); data.put("guidOpinion", babyPatientExtendEarScreen.getGuidOpinion()); data.put("checkDoctorId", babyPatientExtendEarScreen.getCheckDoctorId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/InitScreen.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/InitScreen.java new file mode 100644 index 0000000..b7f63db --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/InitScreen.java @@ -0,0 +1,34 @@ +package com.lyms.platform.operate.web.result; + +import com.lyms.platform.common.result.BaseResponse; + +import java.util.List; +import java.util.Map; + +/** + * @auther yangfei + * @createTime 2017年08月09日 11时11分 + * @discription 听筛初始化数据 + */ +public class InitScreen extends BaseResponse { + //听力基因类型 + private List> deafEnumsResult; + //高危儿的确定因素 + private List> highRiskConfirms; + + public List> getHighRiskConfirms() { + return highRiskConfirms; + } + + public void setHighRiskConfirms(List> highRiskConfirms) { + this.highRiskConfirms = highRiskConfirms; + } + + public List> getDeafEnumsResult() { + return deafEnumsResult; + } + + public void setDeafEnumsResult(List> deafEnumsResult) { + this.deafEnumsResult = deafEnumsResult; + } +}