diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java index 294e316..8b9c120 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java @@ -481,8 +481,10 @@ public class BabyModel extends BaseModel { //血样状态 1合格 2不合格 private String sieveStatuseNwXy; - //筛查结果（1阳性、2阴性）: - private String csjg; + //新筛四项筛查结果（1阳性、2阴性 4召回） + private String xscsjg; + //串联质谱筛查结果（1阳性、2阴性 4召回 6临床确诊） + private String clcsjg; //两病支付方式（1自费、2免费） private String pay_type; //串联支付方式（1自费、2免费） @@ -2012,12 +2014,20 @@ public class BabyModel extends BaseModel { this.sieveStatuseNwXy = sieveStatuseNwXy; } - public String getCsjg() { - return csjg; + public String getXscsjg() { + return xscsjg; } - public void setCsjg(String csjg) { - this.csjg = csjg; + public void setXscsjg(String xscsjg) { + this.xscsjg = xscsjg; + } + + public String getClcsjg() { + return clcsjg; + } + + public void setClcsjg(String clcsjg) { + this.clcsjg = clcsjg; } public String getPay_type() { diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabySieveQhdModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabySieveQhdModel.java index d4040a1..ef22a3e 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabySieveQhdModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabySieveQhdModel.java @@ -19,6 +19,10 @@ import java.util.Map; @Document(collection = "lyms_baby_sieve_qhd") public class BabySieveQhdModel extends BaseModel { private static final long serialVersionUID = SerialIdEnum.BabySieveQhdModel.getCid(); + //串联质谱筛查结果 + private String clresultJSON; + //新筛四项筛查结果 + private String xsresultJSON; /*基本信息*/ private String id; @@ -38,13 +42,16 @@ public class BabySieveQhdModel extends BaseModel { /*儿童信息*/ /* 筛查状态 null：0 待申请（操作：空），1：已申请（操作：修改筛查信息，查看申请单）， - 2：已接收 + 1合格 =（操作：查看申请单）， + 2不合格（操作：修改筛查信息，查看申请单）3：有结果（操作：查看结果） + //2：已接收 + 1合格 =（操作：查看申请单）， + 2不合格（操作：修改筛查信息，查看申请单） + 3：有结果（操作：查看结果） */ private String sieveStatuseNw; //血样状态 1 合格 2 不合格 private String sieveStatuseNwXy; - //筛查结果（1 阳性、2 阴性）: - private String csjg; + //新筛四项筛查结果（1阳性、2阴性 4召回） + private String xscsjg; + //串联质谱筛查结果（1阳性、2阴性 4召回 6临床确诊） + private String clcsjg; /*筛查信息*/ //新筛四病 TestItem PHE,TSH,OHP,G6PD (多项用英文逗号隔开，目前除了市妇幼其它采血机构都是默认两项“PHE,TSH”) @@ -179,12 +186,20 @@ public class BabySieveQhdModel extends BaseModel { this.sieveStatuseNwXy = sieveStatuseNwXy; } - public String getCsjg() { - return csjg; + public String getXscsjg() { + return xscsjg; } - public void setCsjg(String csjg) { - this.csjg = csjg; + public void setXscsjg(String xscsjg) { + this.xscsjg = xscsjg; + } + + public String getClcsjg() { + return clcsjg; + } + + public void setClcsjg(String clcsjg) { + this.clcsjg = clcsjg; } public String getTestItem() { @@ -395,6 +410,21 @@ public class BabySieveQhdModel extends BaseModel { this.weight = weight; } + public String getClresultJSON() { + return clresultJSON; + } + + public void setClresultJSON(String clresultJSON) { + this.clresultJSON = clresultJSON; + } + + public String getXsresultJSON() { + return xsresultJSON; + } + + public void setXsresultJSON(String xsresultJSON) { + this.xsresultJSON = xsresultJSON; + } public Map convertToDataModel(){ Map map = new HashMap (); @@ -416,10 +446,22 @@ public class BabySieveQhdModel extends BaseModel { }else if("2".equals(sieveStatuseNwXy)){ map.put("sieveStatuseNwXy","不合格"); } - if("1".equals(csjg)){ - map.put("csjg","阳性"); - }else if("2".equals(csjg)){ - map.put("csjg","阴性"); + if("1".equals(clcsjg)){ + map.put("clcsjg","阳性"); + }else if("2".equals(clcsjg)){ + map.put("clcsjg","阴性"); + }else if("4".equals(xscsjg)){ + map.put("xscsjg","召回"); + }else if("6".equals(xscsjg)){ + map.put("xscsjg","临床确诊"); + } + + if("1".equals(xscsjg)){ + map.put("xscsjg","阳性"); + }else if("2".equals(xscsjg)){ + map.put("xscsjg","阴性"); + }else if("4".equals(xscsjg)){ + map.put("xscsjg","召回"); } map.put("testItem",testItem); map.put("msms",msms); 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 6351112..e3eead4 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 @@ -35,8 +35,11 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { private String sieveStatuseNw; private List sieveStatuseNwListIn; private List sieveStatuseNwListNin; - //筛查结果（1阳性、2阴性）: - private String csjg; + //新筛四项筛查结果（1阳性、2阴性 4召回） + private String xscsjg; + //串联质谱筛查结果（1阳性、2阴性 4召回 6临床确诊） + private String clcsjg; + //两病支付方式（1自费、2免费） private String pay_type; //串联支付方式（1自费、2免费） @@ -733,12 +736,20 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { this.msTiaoXingMa = msTiaoXingMa; } - public String getCsjg() { - return csjg; + public String getXscsjg() { + return xscsjg; + } + + public void setXscsjg(String xscsjg) { + this.xscsjg = xscsjg; } - public void setCsjg(String csjg) { - this.csjg = csjg; + public String getClcsjg() { + return clcsjg; + } + + public void setClcsjg(String clcsjg) { + this.clcsjg = clcsjg; } public String getPay_type() { @@ -1582,8 +1593,11 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { if (null != sieveStatuseNwListIn) { condition = condition.and("sieveStatuseNw", sieveStatuseNwListIn, MongoOper.IN); } - if (StringUtils.isNotEmpty(csjg)) { - condition = condition.and("csjg", csjg, MongoOper.IS); + if (StringUtils.isNotEmpty(clcsjg)) { + condition = condition.and("clcsjg", clcsjg, MongoOper.IS); + } + if (StringUtils.isNotEmpty(xscsjg)) { + condition = condition.and("xscsjg", xscsjg, MongoOper.IS); } if (StringUtils.isNotEmpty(pay_type)) { condition = condition.and("pay_type", pay_type, MongoOper.IS); diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabySieveQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabySieveQuery.java index 211fe9d..9c4f359 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BabySieveQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabySieveQuery.java @@ -5,7 +5,9 @@ import com.lyms.platform.common.dao.BaseQuery; import com.lyms.platform.common.dao.operator.MongoCondition; import com.lyms.platform.common.dao.operator.MongoOper; import com.lyms.platform.common.dao.operator.MongoQuery; +import com.lyms.platform.common.utils.StringUtils; import org.springframework.data.mongodb.core.query.Criteria; +import org.springframework.util.CollectionUtils; import java.util.Date; import java.util.List; @@ -29,6 +31,67 @@ public class BabySieveQuery extends BaseQuery implements IConvertToNativeQuery { private String order;//排序 private Date sieveDateStart;//筛查开始时间 private Date sieveDateEnd;//筛查结束时间 + //新筛血卡编号： + private String xsTiaoXingMa; + //串联血卡编号: + private String msTiaoXingMa; + + //采血日期 + private Date caiXueTimeStart; + private Date caiXueTimeEnd; + + //新筛四项筛查结果（1阳性、2阴性）: + private List xscsjgNe; + //串联质谱筛查结果（1阳性、2阴性）: + private List clcsjgNe; + + public String getXsTiaoXingMa() { + return xsTiaoXingMa; + } + + public void setXsTiaoXingMa(String xsTiaoXingMa) { + this.xsTiaoXingMa = xsTiaoXingMa; + } + + public String getMsTiaoXingMa() { + return msTiaoXingMa; + } + + public void setMsTiaoXingMa(String msTiaoXingMa) { + this.msTiaoXingMa = msTiaoXingMa; + } + + public Date getCaiXueTimeStart() { + return caiXueTimeStart; + } + + public void setCaiXueTimeStart(Date caiXueTimeStart) { + this.caiXueTimeStart = caiXueTimeStart; + } + + public Date getCaiXueTimeEnd() { + return caiXueTimeEnd; + } + + public void setCaiXueTimeEnd(Date caiXueTimeEnd) { + this.caiXueTimeEnd = caiXueTimeEnd; + } + + public List getClcsjgNe() { + return clcsjgNe; + } + + public void setClcsjgNe(List clcsjgNe) { + this.clcsjgNe = clcsjgNe; + } + + public List getXscsjgNe() { + return xscsjgNe; + } + + public void setXscsjgNe(List xscsjgNe) { + this.xscsjgNe = xscsjgNe; + } public Date getSieveDateStart() { return sieveDateStart; @@ -140,6 +203,18 @@ public class BabySieveQuery extends BaseQuery implements IConvertToNativeQuery { if(null != id){ condition = condition.and("id", id, MongoOper.IS); } + if(StringUtils.isNotEmpty(xsTiaoXingMa)){ + condition = condition.and("xsTiaoXingMa", xsTiaoXingMa, MongoOper.IS); + } + if(StringUtils.isNotEmpty(msTiaoXingMa)){ + condition = condition.and("msTiaoXingMa", msTiaoXingMa, MongoOper.IS); + } + if(!CollectionUtils.isEmpty(xscsjgNe)){ + condition = condition.and("xscsjg", xscsjgNe, MongoOper.NIN); + } + if(!CollectionUtils.isEmpty(clcsjgNe)){ + condition = condition.and("clcsjg", clcsjgNe, MongoOper.NIN); + } if(null != babyId){ condition = condition.and("babyId", babyId, MongoOper.IS); } @@ -183,6 +258,19 @@ public class BabySieveQuery extends BaseQuery implements IConvertToNativeQuery { } } + if(null != caiXueTimeStart){ + c = Criteria.where("caiXueTime").gte(caiXueTimeStart); + } + if(null != caiXueTimeEnd){ + if (null != c) { + c = c.lte(caiXueTimeEnd); + } else { + c = Criteria.where("caiXueTime").lte(caiXueTimeEnd); + } + } + if (c != null) { + return new MongoCondition(c.andOperator(condition.getCriteria())).toMongoQuery(); + } return condition.toMongoQuery(); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabySieveController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabySieveController.java index 7c10f6a..41a873a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabySieveController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabySieveController.java @@ -167,6 +167,16 @@ public class BabySieveController extends BaseController{ public BaseResponse getOneBabySieveQhd(String id) { return babySieveFacede.getOneBabySieveQhd(id); } + /** + * 根据ID查看新生儿筛查申请结果 秦皇岛版 + * @param id + * @return + */ + @ResponseBody + @RequestMapping(value = "/getOneBabySieveResultQhd",method = RequestMethod.GET) + public BaseResponse getOneBabySieveResultQhd(String id) { + return babySieveFacede.getOneBabySieveResultQhd(id); + } /** * 修改状态 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java index abc5c73..ef9b240 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java @@ -157,6 +157,9 @@ public class TestController extends BaseController { private SieveService sieveService; @Autowired + private BabySieveFacede babySieveFacede; + + @Autowired private CdfyHisService cdfyHisService; @Autowired @@ -249,6 +252,27 @@ public class TestController extends BaseController { return babyEyeCheckService.updateBaby(startDate, endDate); } + /** + * 定时获取儿童筛查结果 + * + * @Author: 武涛涛 + * @Date: 2020/12/22 17:16 + */ + @ResponseBody + @RequestMapping(value = "/babySieveTimerWork" , method = RequestMethod.GET) + public BaseResponse babySieveTimerWork(@RequestParam(required = false) String startDate, + @RequestParam(required = false) String endDate, + @RequestParam(required = false) String xsTiaoXingMa, + @RequestParam(required = false) String msTiaoXingMa, + @RequestParam(required = false) String id, + @RequestParam(required = false) String babyId ) { + + Date startDate1 = DateUtil.parseYMD(startDate); + Date endDate1 = DateUtil.getDayLastSecond( DateUtil.parseYMD(endDate)); + babySieveFacede.babySieveList(startDate1, endDate1,xsTiaoXingMa,msTiaoXingMa,id,babyId); + return new BaseResponse(); + } + @ResponseBody @RequestMapping("/sync/doctor/user") public List doctorUserMaps() { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java index 6094dd9..0658656 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java @@ -22,6 +22,7 @@ import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.*; import com.lyms.platform.query.*; import com.mchange.v1.util.ListUtils; +import net.sf.json.JSONObject; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.io.FileUtils; import org.apache.commons.lang.StringUtils; @@ -75,10 +76,13 @@ public class BabySieveFacede { private UsersService usersService; private static final String XS_SAVE = "http://121.22.16.246:8091/MSMS/lyms/xs_save.do";//秦皇岛 新筛四项样本添加 - private static final String MSMS_SAVE = "http://121.22.16.246:8091/MSMS/lyms/msms_save.do";//秦皇岛 串联质谱样本添加 - private static final String XS_UPDATE = "http://121.22.16.246:8091/MSMS/lyms/xs_update.do";//秦皇岛 新筛四项样本更新 + private static final String XSSEARCHRESULT = "http://121.22.16.246:8091/MSMS/lyms/xsSearchResult.do";//秦皇岛 新筛四项结果查询接口 + + private static final String MSMS_SAVE = "http://121.22.16.246:8091/MSMS/lyms/msms_save.do";//秦皇岛 串联质谱样本添加 private static final String MSMS_UPDATE = "http://121.22.16.246:8091/MSMS/lyms/msms_update.do";//秦皇岛 串联质谱样本更新 + private static final String SEARCHRESULT = "http://121.22.16.246:8091/MSMS/lyms/searchResult.do";//秦皇岛 串联结果查询接口 + /** * 新生儿筛查申请前，查询孕妇是否在本院建档以及是否已经录入分娩记录 * @@ -215,6 +219,7 @@ public class BabySieveFacede { } } + /** * 初始化机构 列表 * @Author: 武涛涛 @@ -417,7 +422,6 @@ public class BabySieveFacede { public BaseResponse addOrUpdateBabySieveQhd(BabySieveAddQhdRequest babySieveAddQhdRequest, Integer userId) { BabySieveQhdModel babySieveQhdModel = babySieveAddQhdRequest.convertToDataModel(); String hospital = autoMatchFacade.getHospitalId(userId); - babySieveQhdModel.setHospitalId(hospital); //更新数据 if (StringUtils.isNotEmpty(babySieveAddQhdRequest.getId())) { if (StringUtils.isNotEmpty(babySieveQhdModel.getBabyId())) { @@ -433,6 +437,7 @@ public class BabySieveFacede { return objectResponse; } else { //新增数据 + babySieveQhdModel.setHospitalId(hospital); babySieveQhdService.addBabySieve(babySieveQhdModel); if (StringUtils.isNotEmpty(babySieveQhdModel.getBabyId())) { BabyModelQuery babyQuery = new BabyModelQuery(); @@ -457,6 +462,105 @@ public class BabySieveFacede { } } /** + * + *秦皇岛医院自动获取儿童筛查数据状态 + * @Author: 武涛涛 + * @Date: 2020/12/22 13:56 + */ + public void babySieveTimerWork() { + Date startDate1 = DateUtil.getDayFirstSecond(new Date()); + Date endDate1 = DateUtil.getDayLastSecond(new Date()); + System.out.println("start=" + startDate1 + "end=" + endDate1); + babySieveList(startDate1, endDate1,null,null,null,null); + } + + public void babySieveList(Date startDate1, Date endDate1,String xsTiaoXingMa,String msTiaoXingMa,String id,String babyId) { + BabySieveQuery babySieveQuery = new BabySieveQuery(); + babySieveQuery.setCaiXueTimeStart(startDate1); + babySieveQuery.setCaiXueTimeEnd(endDate1); + babySieveQuery.setXsTiaoXingMa(xsTiaoXingMa); + babySieveQuery.setMsTiaoXingMa(msTiaoXingMa); + babySieveQuery.setId(id); + babySieveQuery.setBabyId(babyId); + + List listXscsjgNe = new ArrayList <>(); + listXscsjgNe.add("2"); + babySieveQuery.setXscsjgNe(listXscsjgNe); + List listClcsjgNe = new ArrayList <>(); + listClcsjgNe.add("1"); + listClcsjgNe.add("6"); + babySieveQuery.setClcsjgNe(listClcsjgNe); + + List babySieveQhdModels = babySieveQhdService.getBabySieveQuery(babySieveQuery); + System.out.println(babySieveQuery.convertToQuery().convertToMongoQuery()); + for(BabySieveQhdModel babySieveQhdModel:babySieveQhdModels){ + Map map = new HashMap(); + map.put("sign","774856af6fc8bbaaf00705886d512fe2"); + map.put("pid", "1553"); + String dshospitalId = XsescEnums.getYchospitalId(babySieveQhdModel.getSsHospital()).getDshospitalId(); + map.put("ssHospital",dshospitalId); + map.put("ssHospital","1623");//测试使用1623 + try { + //新筛四病 + if(StringUtils.isNotEmpty(babySieveQhdModel.getTestItem())){ + map.put("tiaoXingMa", babySieveQhdModel.getXsTiaoXingMa()); + String xs = HttpClientUtil.doGet(XSSEARCHRESULT, map, "utf-8", null); + JSONObject jsonObject = JsonUtil.getObj(xs); + if (jsonObject != null && jsonObject.get("state").equals(1)){ + BabySieveQhdModel bSieve = new BabySieveQhdModel(); + JSONObject jsonObjectData = jsonObject.getJSONObject("data"); + if(jsonObjectData!=null){ + if(jsonObjectData.get("positive").equals(0)){ + bSieve.setXscsjg("2");//（1阳性、2阴性 4召回） + }else if(jsonObjectData.get("positive").equals(1)){ + bSieve.setXscsjg("1"); + }else if(jsonObjectData.get("recall_state").equals(1)){ + bSieve.setXscsjg("4"); + } + bSieve.setXsresultJSON(jsonObjectData.toString()); //检查详细存储起来 + babySieveQhdService.updateBabySieveById(bSieve, babySieveQhdModel.getId()); + } + }else { + operateLogFacade.addModifyOptLog(null, Integer.valueOf(babySieveQhdModel.getHospitalId()),babySieveQhdModel, jsonObject, OptActionEnums.ADD.getId(), "新筛四病结果异常"); + } + + } + } catch (NumberFormatException e) { + e.printStackTrace(); + } + try { + //串联质谱 MSMS + if(StringUtils.isNotEmpty(babySieveQhdModel.getMsms())){ + map.put("tiaoXingMa", babySieveQhdModel.getMsTiaoXingMa()); + String xs = HttpClientUtil.doGet(SEARCHRESULT, map, "utf-8", null); + JSONObject jsonObject = JsonUtil.getObj(xs); + if (jsonObject != null && jsonObject.get("state").equals(1)){ + BabySieveQhdModel bSieve = new BabySieveQhdModel(); + JSONObject jsonObjectData = jsonObject.getJSONObject("data"); + if(jsonObjectData!=null){ + JSONObject patien = jsonObjectData.getJSONObject("patien"); + //串联里面Status2，1正常 2异常 4召回 6临床确诊 + if(patien!=null && patien.get("status2").equals(1)){ + bSieve.setClcsjg("2"); + }else if(patien!=null && patien.get("status2").equals(2)){ + bSieve.setClcsjg("1"); + }else if(patien!=null && patien.get("status2")!=null){ + bSieve.setClcsjg(patien.get("status2").toString()); + } + bSieve.setClresultJSON(jsonObjectData.toString()); //检查详细存储起来 + babySieveQhdService.updateBabySieveById(bSieve, babySieveQhdModel.getId()); + } + }else { + operateLogFacade.addModifyOptLog(null, Integer.valueOf(babySieveQhdModel.getHospitalId()),babySieveQhdModel, jsonObject, OptActionEnums.ADD.getId(), "串联质谱结果异常"); + } + } + } catch (NumberFormatException e) { + e.printStackTrace(); + } + } + } + + /** * 儿童筛查保存 同步到对方系统 秦皇岛 * * @param userId @@ -471,8 +575,8 @@ public class BabySieveFacede { map.put("pid", "1553"); map.put("momName", babySieveQhdModel.getMomName()); String dshospitalId = XsescEnums.getYchospitalId(babySieveQhdModel.getSsHospital()).getDshospitalId(); -// map.put("ssHospital",dshospitalId); //测试使用1623 - map.put("ssHospital","1623"); + map.put("ssHospital",dshospitalId); + map.put("ssHospital","1623");//测试使用1623 map.put("phone",babySieveQhdModel.getPhone()); map.put("zhuYuanNum", babySieveQhdModel.getZhuYuanNum()); map.put("buruSum", babySieveQhdModel.getBuruSum()); @@ -557,7 +661,9 @@ public class BabySieveFacede { model.setMsTiaoXingMa(babySieveAddQhdRequest.getMsTiaoXingMa());//串联血卡编号: model.setSieveStatuseNwXy(babySieveAddQhdRequest.getSieveStatuseNwXy()); //血样状态 1合格 2不合格 - model.setCsjg(babySieveAddQhdRequest.getCsjg());//筛查结果（1阳性、2阴性）: + model.setXscsjg(babySieveAddQhdRequest.getXscsjg());//新筛四项筛查结果（1阳性、2阴性）: + model.setClcsjg(babySieveAddQhdRequest.getClcsjg());//串联质谱筛查结果（1阳性、2阴性）: + model.setPay_type(babySieveAddQhdRequest.getPay_type());//两病支付方式（1自费、2免费） model.setClzffs(babySieveAddQhdRequest.getClzffs());//串联支付方式（1自费、2免费） return model; @@ -801,7 +907,8 @@ public class BabySieveFacede { babyModelQuery.setSieveStatuseNw(babySieveAddQhdRequest.getSieveStatuseNw()); } //筛查结果（1阳性、2阴性） - babyModelQuery.setCsjg(babySieveAddQhdRequest.getCsjg()); + babyModelQuery.setClcsjg(babySieveAddQhdRequest.getClcsjg()); + babyModelQuery.setXscsjg(babySieveAddQhdRequest.getXscsjg()); //两病支付方式（1自费、2免费） babyModelQuery.setPay_type(babySieveAddQhdRequest.getPay_type()); //串联支付方式（1自费、2免费） @@ -893,6 +1000,33 @@ public class BabySieveFacede { return br; } + /** + * 根据ID查看新生儿筛查申请结果 秦皇岛版 + * + * @param id + * @return + */ + public BaseObjectResponse getOneBabySieveResultQhd(String id) { + BaseObjectResponse br = new BaseObjectResponse(); + BabySieveQhdModel bm = babySieveQhdService.findOneBabySieveById(id); + if (bm != null) { + String ssHospital = ""; + if (org.apache.commons.lang.StringUtils.isNotEmpty(bm.getSsHospital())) { + Organization organization = organizationService.getOrganization(Integer.parseInt(bm.getSsHospital())); + if (organization != null && organization.getYn() == YnEnums.YES.getId()) { + ssHospital = organization.getName(); + } + } + bm.setSsHospital(ssHospital); + br.setData(bm); + br.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION); + return br; + } + return br; + } + + + /** * 修改申请单状态（新筛实验室接收按钮） diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabySieveAddQhdRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabySieveAddQhdRequest.java index e13f624..031d452 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabySieveAddQhdRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabySieveAddQhdRequest.java @@ -43,8 +43,10 @@ public class BabySieveAddQhdRequest implements IBasicRequestConvert + + + + + + + + + @@ -213,7 +222,12 @@ - + + + + + + @@ -513,6 +527,7 @@ +