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 166d351..74b8298 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
@@ -6,7 +6,6 @@ import com.lyms.platform.common.dao.BaseQuery;
import java.util.Date;
-
public class BabyPatientExtendEarBabyQuery extends BaseQuery {
private String id;
private String name;
@@ -20,6 +19,7 @@ public class BabyPatientExtendEarBabyQuery extends BaseQuery {
private String vcCardNo;
private String buildDoctor;
private String hospitalId;
+ private String[] hospitalIds;
private Integer buildType;
private String enable;
private String[] enables;
@@ -41,6 +41,14 @@ public class BabyPatientExtendEarBabyQuery extends BaseQuery {
*/
private Date birthEnd;
+ public String[] getHospitalIds() {
+ return hospitalIds;
+ }
+
+ public void setHospitalIds(String[] hospitalIds) {
+ this.hospitalIds = hospitalIds;
+ }
+
public String[] getEnables() {
return enables;
}
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 7647895..f8cd37a 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarBaby.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarBaby.xml
@@ -130,11 +130,11 @@ select id,name,sex,cardNo,birth,mname,mcert_type_id,mcert_no,mphone,vc_card_no,b
and (
name LIKE concat("%",#{queryNo,jdbcType=VARCHAR},"%")
or
- mcert_no LIKE concat("%",#{queryNo,jdbcType=VARCHAR},"%")
+ mcert_no LIKE concat("%",#{queryNo,jdbcType=VARCHAR},"%")
or
mphone LIKE concat(#{queryNo,jdbcType=VARCHAR},"%")
or
- cardno LIKE concat(#{queryNo,jdbcType=VARCHAR},"%")
+ cardno LIKE concat(#{queryNo,jdbcType=VARCHAR},"%")
)
@@ -179,6 +179,14 @@ select id,name,sex,cardNo,birth,mname,mcert_type_id,mcert_no,mphone,vc_card_no,b
and hospital_id = #{hospitalId,jdbcType=VARCHAR}
+
+ and hospital_id in
+
+ #{item}
+
+
+
+
and build_type = #{buildType,jdbcType=INTEGER}
@@ -196,7 +204,7 @@ select id,name,sex,cardNo,birth,mname,mcert_type_id,mcert_no,mphone,vc_card_no,b
and (enable != #{noEnable,jdbcType=VARCHAR}
- or `enable` is null
+ or `enable` is null
)
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 67ebfb5..3a6a4d8 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml
@@ -41,6 +41,16 @@
+
+
+
+
+
+
+
+
+
+
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 f98cbd5..9823475 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
@@ -31,8 +31,7 @@ import javax.servlet.http.HttpServletRequest;
* @since BME V100R001C40B104
*/
@Controller
-public class BabyEarController extends BaseController
-{
+public class BabyEarController extends BaseController {
//日志调测器
private static final Logger logger = LoggerFactory.getLogger(BabyEarController.class);
@@ -44,15 +43,14 @@ public class BabyEarController extends BaseController
* 听力筛查建档
*
* @param babyEarAddRequest 儿童听筛请求对象
- *
* @return 操作是否成功
*/
@TokenRequired
@ResponseBody
- @RequestMapping(method = RequestMethod.POST,value = "/babyear")
- public BaseResponse addBabyEar(@RequestBody BabyEarAddRequest babyEarAddRequest,HttpServletRequest request){
+ @RequestMapping(method = RequestMethod.POST, value = "/babyear")
+ public BaseResponse addBabyEar(@RequestBody BabyEarAddRequest babyEarAddRequest, HttpServletRequest request) {
LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
- return babyEarFacade.addOrUpdateBabyEar(babyEarAddRequest,loginState.getId());
+ return babyEarFacade.addOrUpdateBabyEar(babyEarAddRequest, loginState.getId());
}
/**
@@ -63,18 +61,19 @@ public class BabyEarController extends BaseController
*/
@TokenRequired
@ResponseBody
- @RequestMapping(method = RequestMethod.GET,value = "/queryBabyInfo/{id}")
- public BaseResponse queryBabyInfo(@PathVariable("id")String id){
+ @RequestMapping(method = RequestMethod.GET, value = "/queryBabyInfo/{id}")
+ public BaseResponse queryBabyInfo(@PathVariable("id") String id) {
return babyEarFacade.queryBabyInfo(id);
}
/**
* 听筛建档初始化数据
+ *
* @return
*/
@ResponseBody
- @RequestMapping(method = RequestMethod.GET,value = "/babyear/init")
- public BaseResponse babyEarInit(){
+ @RequestMapping(method = RequestMethod.GET, value = "/babyear/init")
+ public BaseResponse babyEarInit() {
return babyEarFacade.babyEarInit();
}
@@ -82,11 +81,11 @@ 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,HttpServletRequest request){
- return babyEarFacade.deleteBabyEar(id,getUserId(request));
+ public BaseResponse delOneBabyEar(@RequestParam("id") String id, HttpServletRequest request) {
+ return babyEarFacade.deleteBabyEar(id, getUserId(request));
}
/**
@@ -96,8 +95,8 @@ public class BabyEarController extends BaseController
*/
@TokenRequired
@ResponseBody
- @RequestMapping(value = "/babyear",method = RequestMethod.GET)
- public BaseResponse findOneBabyEar(String babyId){
+ @RequestMapping(value = "/babyear", method = RequestMethod.GET)
+ public BaseResponse findOneBabyEar(String babyId) {
return babyEarFacade.findBabyEarById(babyId);
}
@@ -108,8 +107,8 @@ public class BabyEarController extends BaseController
*/
@TokenRequired
@ResponseBody
- @RequestMapping(value = "/babyearView",method = RequestMethod.GET)
- public BaseResponse getBabyEarInfo(String babyId){
+ @RequestMapping(value = "/babyearView", method = RequestMethod.GET)
+ public BaseResponse getBabyEarInfo(String babyId) {
return babyEarFacade.getBabyEarInfo(babyId);
}
@@ -120,13 +119,13 @@ public class BabyEarController extends BaseController
* @param httpServletRequest
* @return
*/
- @RequestMapping(value = "/babyearsrc",method = RequestMethod.POST)
+ @RequestMapping(value = "/babyearsrc", method = RequestMethod.POST)
@ResponseBody
@TokenRequired
// @Link DeafEnums 耳聾基因結果
- public BaseResponse addOrUpdateBabySrc(BabyScreenAddRequest babyScreenAddRequest,HttpServletRequest httpServletRequest){
+ public BaseResponse addOrUpdateBabySrc(BabyScreenAddRequest babyScreenAddRequest, HttpServletRequest httpServletRequest) {
LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext");
- return babyEarFacade.addOneBabyEarSrc(babyScreenAddRequest,loginState.getId());
+ return babyEarFacade.addOneBabyEarSrc(babyScreenAddRequest, loginState.getId());
}
/**
@@ -135,12 +134,12 @@ public class BabyEarController extends BaseController
* @param id
* @return
*/
- @RequestMapping(value = "/babyearsrc",method = RequestMethod.DELETE)
+ @RequestMapping(value = "/babyearsrc", method = RequestMethod.DELETE)
@ResponseBody
@TokenRequired
- public BaseResponse delOneBabySrc(@RequestParam("id")String id,HttpServletRequest httpServletRequest){
+ public BaseResponse delOneBabySrc(@RequestParam("id") String id, HttpServletRequest httpServletRequest) {
LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext");
- return babyEarFacade.delOneBabyEarSrc(id, loginState.getId());
+ return babyEarFacade.delOneBabyEarSrc(id, loginState.getId());
}
/**
@@ -149,24 +148,25 @@ public class BabyEarController extends BaseController
* @param babyId
* @return
*/
- @RequestMapping(value = "/babyearsrc/{babyId}",method = RequestMethod.GET)
+ @RequestMapping(value = "/babyearsrc/{babyId}", method = RequestMethod.GET)
@ResponseBody
@TokenRequired
- public BaseResponse getBabyIdBabySrc(@PathVariable("babyId")String babyId,HttpServletRequest httpServletRequest){
+ public BaseResponse getBabyIdBabySrc(@PathVariable("babyId") String babyId, HttpServletRequest httpServletRequest) {
LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext");
- return babyEarFacade.findBabyEarSrc(babyId, loginState.getId());
+ return babyEarFacade.findBabyEarSrc(babyId, loginState.getId());
}
+
/**
* 获取听筛记录
*
* @param id
* @return
*/
- @RequestMapping(value = "/babyearsrc",method = RequestMethod.GET)
+ @RequestMapping(value = "/babyearsrc", method = RequestMethod.GET)
@ResponseBody
@TokenRequired
- public BaseResponse getOneBabySrc(@RequestParam("id")String id){
- return babyEarFacade.findOneBabyEarSrc(id);
+ public BaseResponse getOneBabySrc(@RequestParam("id") String id) {
+ return babyEarFacade.findOneBabyEarSrc(id);
}
/**
@@ -175,11 +175,27 @@ public class BabyEarController extends BaseController
* @param earScreenListRequest 查询条件
* @return
*/
- @RequestMapping(value = "/babyearListsrc",method = RequestMethod.GET)
+ @RequestMapping(value = "/babyearListsrc", method = RequestMethod.GET)
+ @ResponseBody
+ @TokenRequired
+ public BaseResponse babyearListsrc(EarScreenListRequest earScreenListRequest, HttpServletRequest httpServletRequest) {
+ LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext");
+ return babyEarFacade.findListBabyEarSrc(earScreenListRequest, loginState.getId());
+ }
+
+ /**
+ * 儿童听力筛查区域查询列表
+ * @param earScreenListRequest
+ * @param httpServletRequest
+ * @return
+ */
+ @RequestMapping(value = "/babyearListRegion", method = RequestMethod.GET)
@ResponseBody
@TokenRequired
- public BaseResponse babyearListsrc(EarScreenListRequest earScreenListRequest,HttpServletRequest httpServletRequest){
+ public BaseResponse babyearListRegion(EarScreenListRequest earScreenListRequest, HttpServletRequest httpServletRequest) {
LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext");
- return babyEarFacade.findListBabyEarSrc(earScreenListRequest,loginState.getId());
+ return babyEarFacade.babyearListRegion(earScreenListRequest, loginState.getId());
}
+
+
}
\ No newline at end of file
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 609bb22..4aeddd3 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
@@ -1762,16 +1762,24 @@ public class BabyEarFacade {
data.put("rrna1555", babyPatientExtendEarScreen.getRrna1555() == null ? "" : babyPatientExtendEarScreen.getRrna1555());
data.put("rrna1555Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getRrna1555() == null ? 0 : babyPatientExtendEarScreen.getRrna1555()));
- data.put("motherGjb2Del35", DeafEnums.getTitle(babyPatientExtendEarScreen.getMotherGjb2Del35() == null ? 0 : babyPatientExtendEarScreen.getMotherGjb2Del35()));
- data.put("motherGjb2Del176", DeafEnums.getTitle(babyPatientExtendEarScreen.getMotherGjb2Del176() == null ? 0 : babyPatientExtendEarScreen.getMotherGjb2Del176()));
- data.put("motherGjb2Del235", DeafEnums.getTitle(babyPatientExtendEarScreen.getMotherGjb2Del235() == null ? 0 : babyPatientExtendEarScreen.getMotherGjb2Del235()));
- data.put("motherGjb2Del299", DeafEnums.getTitle(babyPatientExtendEarScreen.getMotherGjb2Del299() == null ? 0 : babyPatientExtendEarScreen.getMotherGjb2Del299()));
- data.put("motherGjb3Slc26a4538", DeafEnums.getTitle(babyPatientExtendEarScreen.getMotherGjb3Slc26a4538() == null ? 0 : babyPatientExtendEarScreen.getMotherGjb3Slc26a4538()));
- data.put("motherGjb3Slc26a42168", DeafEnums.getTitle(babyPatientExtendEarScreen.getMotherGjb3Slc26a42168() == null ? 0 : babyPatientExtendEarScreen.getMotherGjb3Slc26a42168()));
- data.put("motherGjb3Slc26a4Ivs7", DeafEnums.getTitle(babyPatientExtendEarScreen.getMotherGjb3Slc26a4Ivs7() == null ? 0 : babyPatientExtendEarScreen.getMotherGjb3Slc26a4Ivs7()));
- data.put("motherRrna1494", DeafEnums.getTitle(babyPatientExtendEarScreen.getMotherRrna1494() == null ? 0 : babyPatientExtendEarScreen.getMotherRrna1494()));
- data.put("motherRrna1555", DeafEnums.getTitle(babyPatientExtendEarScreen.getMotherRrna1555() == null ? 0 : babyPatientExtendEarScreen.getMotherRrna1555()));
-
+ data.put("motherGjb2Del35Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getMotherGjb2Del35() == null ? 0 : babyPatientExtendEarScreen.getMotherGjb2Del35()));
+ data.put("motherGjb2Del35", babyPatientExtendEarScreen.getMotherGjb2Del35() == null ? "" : babyPatientExtendEarScreen.getMotherGjb2Del35());
+ data.put("motherGjb2Del176Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getMotherGjb2Del176() == null ? 0 : babyPatientExtendEarScreen.getMotherGjb2Del176()));
+ data.put("motherGjb2Del176", babyPatientExtendEarScreen.getMotherGjb2Del176() == null ? "" : babyPatientExtendEarScreen.getMotherGjb2Del176());
+ data.put("motherGjb2Del235Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getMotherGjb2Del235() == null ? 0 : babyPatientExtendEarScreen.getMotherGjb2Del235()));
+ data.put("motherGjb2Del235", babyPatientExtendEarScreen.getMotherGjb2Del235() == null ? "" : babyPatientExtendEarScreen.getMotherGjb2Del235());
+ data.put("motherGjb2Del299Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getMotherGjb2Del299() == null ? 0 : babyPatientExtendEarScreen.getMotherGjb2Del299()));
+ data.put("motherGjb2Del299", babyPatientExtendEarScreen.getMotherGjb2Del299() == null ? "" : babyPatientExtendEarScreen.getMotherGjb2Del299());
+ data.put("motherGjb3Slc26a4538Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getMotherGjb3Slc26a4538() == null ? 0 : babyPatientExtendEarScreen.getMotherGjb3Slc26a4538()));
+ data.put("motherGjb3Slc26a4538", babyPatientExtendEarScreen.getMotherGjb3Slc26a4538() == null ? "" : babyPatientExtendEarScreen.getMotherGjb3Slc26a4538());
+ data.put("motherGjb3Slc26a42168Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getMotherGjb3Slc26a42168() == null ? 0 : babyPatientExtendEarScreen.getMotherGjb3Slc26a42168()));
+ data.put("motherGjb3Slc26a42168", babyPatientExtendEarScreen.getMotherGjb3Slc26a42168() == null ? "" : babyPatientExtendEarScreen.getMotherGjb3Slc26a42168());
+ data.put("motherGjb3Slc26a4Ivs7Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getMotherGjb3Slc26a4Ivs7() == null ? 0 : babyPatientExtendEarScreen.getMotherGjb3Slc26a4Ivs7()));
+ data.put("motherGjb3Slc26a4Ivs7", babyPatientExtendEarScreen.getMotherGjb3Slc26a4Ivs7() == null ? "" : babyPatientExtendEarScreen.getMotherGjb3Slc26a4Ivs7());
+ data.put("motherRrna1494Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getMotherRrna1494() == null ? 0 : babyPatientExtendEarScreen.getMotherRrna1494()));
+ data.put("motherRrna1494", babyPatientExtendEarScreen.getMotherRrna1494() == null ? "" : babyPatientExtendEarScreen.getMotherRrna1494());
+ data.put("motherRrna1555Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getMotherRrna1555() == null ? 0 : babyPatientExtendEarScreen.getMotherRrna1555()));
+ data.put("motherRrna1555", babyPatientExtendEarScreen.getMotherRrna1555() == null ? "" : babyPatientExtendEarScreen.getMotherRrna1555());
data.put("processOptionType", babyPatientExtendEarScreen.getProcessOptionType());//1=复筛 2=诊断
data.put("processOptionTypeStr", babyPatientExtendEarScreen.getProcessOptionType() == null ? "初诊" : babyPatientExtendEarScreen.getProcessOptionType() == 1 ? "复筛" : "诊断");//1=复筛 2=诊断
@@ -2091,4 +2099,112 @@ public class BabyEarFacade {
}
return br;
}
+
+ /**
+ * 区域儿童听力筛查管理
+ *
+ * @param earScreenListRequest
+ * @param userId
+ * @return
+ */
+ public BaseResponse babyearListRegion(EarScreenListRequest earScreenListRequest, Integer userId) {
+ //获取当前用户能看到的那些医院
+ List hospital = groupsFacade.findGroupHospital(userId, false);
+ String[] hospitalIdArray = new String[hospital.size()];
+
+ BabyPatientExtendEarScreenQuery screenQuery = new BabyPatientExtendEarScreenQuery();
+ screenQuery.setSrcStartTime(earScreenListRequest.getSrcStartTime());
+ screenQuery.setSrcEndTime(earScreenListRequest.getSrcEndTime());
+ screenQuery.setCheckDoctorId(earScreenListRequest.getCheckDoctorId());
+ screenQuery.setScreenType(earScreenListRequest.getScreenType());
+ screenQuery.setScrIspass(earScreenListRequest.getIsPass());
+ screenQuery.setLeftRight(earScreenListRequest.getLeftRight());
+ screenQuery.setSrcSkill(earScreenListRequest.getSrcSkill());
+ screenQuery.setNextStartTime(earScreenListRequest.getNextStartTime());
+ screenQuery.setNextEndTime(earScreenListRequest.getNextEndTime());
+ //当前登录人医院Id
+
+ screenQuery.setCheckHospitalIds(hospital.toArray(hospitalIdArray));
+ screenQuery.setStatus(0);
+ screenQuery.setSort("screen_date");
+ screenQuery.setNeed("y");
+ screenQuery.setPage(earScreenListRequest.getPage());
+ screenQuery.setOffset((earScreenListRequest.getPage() - 1) * earScreenListRequest.getLimit());
+ screenQuery.setLimit(earScreenListRequest.getLimit());
+
+ //如果查询号不为空，根据查询号查询儿童档案表，获取儿童档案Id
+ if (StringUtils.isNotEmpty(earScreenListRequest.getKeyWord()) || earScreenListRequest.getBirthStartTime() != null || earScreenListRequest.getBirthEndTime() != null) {//关键字：姓名、联系方式、就诊卡 查询babyId
+ BabyPatientExtendEarBabyQuery babyQuery = new BabyPatientExtendEarBabyQuery();
+ babyQuery.setQueryNo(earScreenListRequest.getKeyWord());
+ babyQuery.setHospitalIds(hospital.toArray(hospitalIdArray));
+ babyQuery.setBirthStart(earScreenListRequest.getBirthStartTime());
+ babyQuery.setBirthEnd(earScreenListRequest.getBirthEndTime());
+ List models = earBabyService.queryBabyPatientExtendEarBaby(babyQuery);
+ if (CollectionUtils.isNotEmpty(models)) {
+ List babyIds = new ArrayList<>();
+ for (BabyPatientExtendEarBaby babyModel : models) {
+ babyIds.add(babyModel.getBabyPatientId());
+ }
+ screenQuery.setBabyIds(babyIds.toArray(new String[babyIds.size()]));
+ } else {
+ return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("没有找到数据");
+ }
+ }
+
+
+ List babyPatientExtendEarScreens = babyPatientExtendEarScreenService.queryEarScreenList(screenQuery);
+ List earScreenResults = new ArrayList<>();
+ for (BabyPatientExtendEarScreen earScreen : babyPatientExtendEarScreens) {
+ EarScreenResult screenResult = new EarScreenResult();
+ screenResult.setId(earScreen.getId());
+ BabyModel babyModel = babyService.getOneBabyById(earScreen.getBabyId());
+ if (babyModel != null) {
+ screenResult.setBabyName(babyModel.getName());
+ screenResult.setMommyName(babyModel.getMname());
+ screenResult.setSex(SexEnum.getTextById(babyModel.getSex()));
+ screenResult.setMonthAge(DateUtil.getBabyMonthAge(babyModel.getBirth(), earScreen.getScreenDate()));
+ screenResult.setBirthday(DateUtil.getyyyy_MM_dd(babyModel.getBirth()));
+ screenResult.setMommnyEncryptPhone(com.lyms.platform.common.utils.StringUtils.encryPhone(babyModel.getMphone()));
+ }
+ if (StringUtils.isNotEmpty(earScreen.getHighRiskCause()))//听力高危因素文字 HighRiskEnum
+ {
+ StringBuffer hfBuff = new StringBuffer();
+ String[] highFactors = earScreen.getHighRiskCause().split(",");
+ for (String hf : highFactors) {
+ if (StringUtils.isNotEmpty(hf)) {
+ String name = HighRiskEnum.getTitle(Integer.parseInt(hf));
+ hfBuff.append(name + "、");
+ }
+ }
+ String hfString = null;
+ if (hfBuff.toString().endsWith("、")) {
+ hfString = hfBuff.substring(0, hfBuff.length() - 1);
+ } else {
+ hfString = hfBuff.toString();
+ }
+ screenResult.setHighRiskCause(hfString);
+ }
+ String srcResult = "通过";
+
+ if (earScreen.getScrIspass() != null) {
+ if (earScreen.getScrIspass() == 2) {//不通过
+ srcResult = "未通过";
+ }
+ }
+ screenResult.setSrcResult(srcResult);
+ screenResult.setBabyId(earScreen.getBabyId());
+ screenResult.setSrcType(earScreen.getScreenType() == 1 ? "初筛" : "复筛");
+ if (StringUtils.isNotEmpty(earScreen.getCheckDoctorId())) {
+ screenResult.setSrcDoctor(usersService.getUsers(Integer.valueOf(earScreen.getCheckDoctorId())).getName());
+ }
+ screenResult.setSrcTime(DateUtil.getyyyy_MM_dd(earScreen.getScreenDate()));
+ earScreenResults.add(screenResult);
+ }
+ BaseListResponse baseResponse = new BaseListResponse();
+ baseResponse.setObject(earScreenResults);
+ baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
+ baseResponse.setPageInfo(screenQuery.getPageInfo());
+ baseResponse.setErrormsg("成功");
+ return baseResponse;
+ }
}