jiangjiazhi / regional-platform

Commit db09b5dbf5ded1eeff5cd77a821e99f40c9ae66a

Authored by wtt over 5 years ago

Exists in master and in 6 other branches

update

Showing 11 changed files with 421 additions and 50 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java
platform-dal/src/main/java/com/lyms/platform/pojo/BabySieveQhdModel.java
platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
platform-dal/src/main/java/com/lyms/platform/query/BabySieveQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabySieveController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabySieveAddQhdRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabySieveQhdManager.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabySieveQhdHandleTask.java
platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml

...	...	@@ -481,8 +481,10 @@
481	481	//血样状态 1合格 2不合格
482	482	private String sieveStatuseNwXy;
483	483
484		- //筛查结果（1阳性、2阴性）:
485		- private String csjg;
	484	+ //新筛四项筛查结果（1阳性、2阴性 4召回）
	485	+ private String xscsjg;
	486	+ //串联质谱筛查结果（1阳性、2阴性 4召回 6临床确诊）
	487	+ private String clcsjg;
486	488	//两病支付方式（1自费、2免费）
487	489	private String pay_type;
488	490	//串联支付方式（1自费、2免费）
489	491
...	...	@@ -2012,12 +2014,20 @@
2012	2014	this.sieveStatuseNwXy = sieveStatuseNwXy;
2013	2015	}
2014	2016
2015		- public String getCsjg() {
2016		- return csjg;
	2017	+ public String getXscsjg() {
	2018	+ return xscsjg;
2017	2019	}
2018	2020
2019		- public void setCsjg(String csjg) {
2020		- this.csjg = csjg;
	2021	+ public void setXscsjg(String xscsjg) {
	2022	+ this.xscsjg = xscsjg;
	2023	+ }
	2024	+
	2025	+ public String getClcsjg() {
	2026	+ return clcsjg;
	2027	+ }
	2028	+
	2029	+ public void setClcsjg(String clcsjg) {
	2030	+ this.clcsjg = clcsjg;
2021	2031	}
2022	2032
2023	2033	public String getPay_type() {

...	...	@@ -19,6 +19,10 @@
19	19	@Document(collection = "lyms_baby_sieve_qhd")
20	20	public class BabySieveQhdModel extends BaseModel {
21	21	private static final long serialVersionUID = SerialIdEnum.BabySieveQhdModel.getCid();
	22	+ //串联质谱筛查结果
	23	+ private String clresultJSON;
	24	+ //新筛四项筛查结果
	25	+ private String xsresultJSON;
22	26
23	27	/基本信息/
24	28	private String id;
25	29
...	...	@@ -38,13 +42,16 @@
38	42	/儿童信息/
39	43	/*
40	44	筛查状态 null：0 待申请（操作：空），1：已申请（操作：修改筛查信息，查看申请单），
41		- 2：已接收 + 1合格 =（操作：查看申请单）， + 2不合格（操作：修改筛查信息，查看申请单）3：有结果（操作：查看结果）
	45	+ //2：已接收 + 1合格 =（操作：查看申请单）， + 2不合格（操作：修改筛查信息，查看申请单）
	46	+ 3：有结果（操作：查看结果）
42	47	*/
43	48	private String sieveStatuseNw;
44	49	//血样状态 1 合格 2 不合格
45	50	private String sieveStatuseNwXy;
46		- //筛查结果（1 阳性、2 阴性）:
47		- private String csjg;
	51	+ //新筛四项筛查结果（1阳性、2阴性 4召回）
	52	+ private String xscsjg;
	53	+ //串联质谱筛查结果（1阳性、2阴性 4召回 6临床确诊）
	54	+ private String clcsjg;
48	55
49	56	/筛查信息/
50	57	//新筛四病 TestItem PHE,TSH,OHP,G6PD (多项用英文逗号隔开，目前除了市妇幼其它采血机构都是默认两项“PHE,TSH”)
51	58
52	59
...	...	@@ -179,14 +186,22 @@
179	186	this.sieveStatuseNwXy = sieveStatuseNwXy;
180	187	}
181	188
182		- public String getCsjg() {
183		- return csjg;
	189	+ public String getXscsjg() {
	190	+ return xscsjg;
184	191	}
185	192
186		- public void setCsjg(String csjg) {
187		- this.csjg = csjg;
	193	+ public void setXscsjg(String xscsjg) {
	194	+ this.xscsjg = xscsjg;
188	195	}
189	196
	197	+ public String getClcsjg() {
	198	+ return clcsjg;
	199	+ }
	200	+
	201	+ public void setClcsjg(String clcsjg) {
	202	+ this.clcsjg = clcsjg;
	203	+ }
	204	+
190	205	public String getTestItem() {
191	206	return testItem;
192	207	}
193	208
...	...	@@ -395,7 +410,22 @@
395	410	this.weight = weight;
396	411	}
397	412
	413	+ public String getClresultJSON() {
	414	+ return clresultJSON;
	415	+ }
398	416
	417	+ public void setClresultJSON(String clresultJSON) {
	418	+ this.clresultJSON = clresultJSON;
	419	+ }
	420	+
	421	+ public String getXsresultJSON() {
	422	+ return xsresultJSON;
	423	+ }
	424	+
	425	+ public void setXsresultJSON(String xsresultJSON) {
	426	+ this.xsresultJSON = xsresultJSON;
	427	+ }
	428	+
399	429	public Map <String,String> convertToDataModel(){
400	430	Map<String,String> map = new HashMap <String,String>();
401	431	map.put("id",id);
...	...	@@ -416,10 +446,22 @@
416	446	}else if("2".equals(sieveStatuseNwXy)){
417	447	map.put("sieveStatuseNwXy","不合格");
418	448	}
419		- if("1".equals(csjg)){
420		- map.put("csjg","阳性");
421		- }else if("2".equals(csjg)){
422		- map.put("csjg","阴性");
	449	+ if("1".equals(clcsjg)){
	450	+ map.put("clcsjg","阳性");
	451	+ }else if("2".equals(clcsjg)){
	452	+ map.put("clcsjg","阴性");
	453	+ }else if("4".equals(xscsjg)){
	454	+ map.put("xscsjg","召回");
	455	+ }else if("6".equals(xscsjg)){
	456	+ map.put("xscsjg","临床确诊");
	457	+ }
	458	+
	459	+ if("1".equals(xscsjg)){
	460	+ map.put("xscsjg","阳性");
	461	+ }else if("2".equals(xscsjg)){
	462	+ map.put("xscsjg","阴性");
	463	+ }else if("4".equals(xscsjg)){
	464	+ map.put("xscsjg","召回");
423	465	}
424	466	map.put("testItem",testItem);
425	467	map.put("msms",msms);

...	...	@@ -35,8 +35,11 @@
35	35	private String sieveStatuseNw;
36	36	private List sieveStatuseNwListIn;
37	37	private List sieveStatuseNwListNin;
38		- //筛查结果（1阳性、2阴性）:
39		- private String csjg;
	38	+ //新筛四项筛查结果（1阳性、2阴性 4召回）
	39	+ private String xscsjg;
	40	+ //串联质谱筛查结果（1阳性、2阴性 4召回 6临床确诊）
	41	+ private String clcsjg;
	42	+
40	43	//两病支付方式（1自费、2免费）
41	44	private String pay_type;
42	45	//串联支付方式（1自费、2免费）
43	46
44	47
...	...	@@ -733,14 +736,22 @@
733	736	this.msTiaoXingMa = msTiaoXingMa;
734	737	}
735	738
736		- public String getCsjg() {
737		- return csjg;
	739	+ public String getXscsjg() {
	740	+ return xscsjg;
738	741	}
739	742
740		- public void setCsjg(String csjg) {
741		- this.csjg = csjg;
	743	+ public void setXscsjg(String xscsjg) {
	744	+ this.xscsjg = xscsjg;
742	745	}
743	746
	747	+ public String getClcsjg() {
	748	+ return clcsjg;
	749	+ }
	750	+
	751	+ public void setClcsjg(String clcsjg) {
	752	+ this.clcsjg = clcsjg;
	753	+ }
	754	+
744	755	public String getPay_type() {
745	756	return pay_type;
746	757	}
...	...	@@ -1582,8 +1593,11 @@
1582	1593	if (null != sieveStatuseNwListIn) {
1583	1594	condition = condition.and("sieveStatuseNw", sieveStatuseNwListIn, MongoOper.IN);
1584	1595	}
1585		- if (StringUtils.isNotEmpty(csjg)) {
1586		- condition = condition.and("csjg", csjg, MongoOper.IS);
	1596	+ if (StringUtils.isNotEmpty(clcsjg)) {
	1597	+ condition = condition.and("clcsjg", clcsjg, MongoOper.IS);
	1598	+ }
	1599	+ if (StringUtils.isNotEmpty(xscsjg)) {
	1600	+ condition = condition.and("xscsjg", xscsjg, MongoOper.IS);
1587	1601	}
1588	1602	if (StringUtils.isNotEmpty(pay_type)) {
1589	1603	condition = condition.and("pay_type", pay_type, MongoOper.IS);

...	...	@@ -5,7 +5,9 @@
5	5	import com.lyms.platform.common.dao.operator.MongoCondition;
6	6	import com.lyms.platform.common.dao.operator.MongoOper;
7	7	import com.lyms.platform.common.dao.operator.MongoQuery;
	8	+import com.lyms.platform.common.utils.StringUtils;
8	9	import org.springframework.data.mongodb.core.query.Criteria;
	10	+import org.springframework.util.CollectionUtils;
9	11
10	12	import java.util.Date;
11	13	import java.util.List;
12	14
...	...	@@ -29,7 +31,68 @@
29	31	private String order;//排序
30	32	private Date sieveDateStart;//筛查开始时间
31	33	private Date sieveDateEnd;//筛查结束时间
	34	+ //新筛血卡编号：
	35	+ private String xsTiaoXingMa;
	36	+ //串联血卡编号:
	37	+ private String msTiaoXingMa;
32	38
	39	+ //采血日期
	40	+ private Date caiXueTimeStart;
	41	+ private Date caiXueTimeEnd;
	42	+
	43	+ //新筛四项筛查结果（1阳性、2阴性）:
	44	+ private List<String> xscsjgNe;
	45	+ //串联质谱筛查结果（1阳性、2阴性）:
	46	+ private List<String> clcsjgNe;
	47	+
	48	+ public String getXsTiaoXingMa() {
	49	+ return xsTiaoXingMa;
	50	+ }
	51	+
	52	+ public void setXsTiaoXingMa(String xsTiaoXingMa) {
	53	+ this.xsTiaoXingMa = xsTiaoXingMa;
	54	+ }
	55	+
	56	+ public String getMsTiaoXingMa() {
	57	+ return msTiaoXingMa;
	58	+ }
	59	+
	60	+ public void setMsTiaoXingMa(String msTiaoXingMa) {
	61	+ this.msTiaoXingMa = msTiaoXingMa;
	62	+ }
	63	+
	64	+ public Date getCaiXueTimeStart() {
	65	+ return caiXueTimeStart;
	66	+ }
	67	+
	68	+ public void setCaiXueTimeStart(Date caiXueTimeStart) {
	69	+ this.caiXueTimeStart = caiXueTimeStart;
	70	+ }
	71	+
	72	+ public Date getCaiXueTimeEnd() {
	73	+ return caiXueTimeEnd;
	74	+ }
	75	+
	76	+ public void setCaiXueTimeEnd(Date caiXueTimeEnd) {
	77	+ this.caiXueTimeEnd = caiXueTimeEnd;
	78	+ }
	79	+
	80	+ public List <String> getClcsjgNe() {
	81	+ return clcsjgNe;
	82	+ }
	83	+
	84	+ public void setClcsjgNe(List <String> clcsjgNe) {
	85	+ this.clcsjgNe = clcsjgNe;
	86	+ }
	87	+
	88	+ public List <String> getXscsjgNe() {
	89	+ return xscsjgNe;
	90	+ }
	91	+
	92	+ public void setXscsjgNe(List <String> xscsjgNe) {
	93	+ this.xscsjgNe = xscsjgNe;
	94	+ }
	95	+
33	96	public Date getSieveDateStart() {
34	97	return sieveDateStart;
35	98	}
...	...	@@ -140,6 +203,18 @@
140	203	if(null != id){
141	204	condition = condition.and("id", id, MongoOper.IS);
142	205	}
	206	+ if(StringUtils.isNotEmpty(xsTiaoXingMa)){
	207	+ condition = condition.and("xsTiaoXingMa", xsTiaoXingMa, MongoOper.IS);
	208	+ }
	209	+ if(StringUtils.isNotEmpty(msTiaoXingMa)){
	210	+ condition = condition.and("msTiaoXingMa", msTiaoXingMa, MongoOper.IS);
	211	+ }
	212	+ if(!CollectionUtils.isEmpty(xscsjgNe)){
	213	+ condition = condition.and("xscsjg", xscsjgNe, MongoOper.NIN);
	214	+ }
	215	+ if(!CollectionUtils.isEmpty(clcsjgNe)){
	216	+ condition = condition.and("clcsjg", clcsjgNe, MongoOper.NIN);
	217	+ }
143	218	if(null != babyId){
144	219	condition = condition.and("babyId", babyId, MongoOper.IS);
145	220	}
...	...	@@ -183,6 +258,19 @@
183	258	}
184	259	}
185	260
	261	+ if(null != caiXueTimeStart){
	262	+ c = Criteria.where("caiXueTime").gte(caiXueTimeStart);
	263	+ }
	264	+ if(null != caiXueTimeEnd){
	265	+ if (null != c) {
	266	+ c = c.lte(caiXueTimeEnd);
	267	+ } else {
	268	+ c = Criteria.where("caiXueTime").lte(caiXueTimeEnd);
	269	+ }
	270	+ }
	271	+ if (c != null) {
	272	+ return new MongoCondition(c.andOperator(condition.getCriteria())).toMongoQuery();
	273	+ }
186	274	return condition.toMongoQuery();
187	275	}
188	276	}

...	...	@@ -167,6 +167,16 @@
167	167	public BaseResponse getOneBabySieveQhd(String id) {
168	168	return babySieveFacede.getOneBabySieveQhd(id);
169	169	}
	170	+ /**
	171	+ * 根据ID查看新生儿筛查申请结果秦皇岛版
	172	+ * @param id
	173	+ * @return
	174	+ */
	175	+ @ResponseBody
	176	+ @RequestMapping(value = "/getOneBabySieveResultQhd",method = RequestMethod.GET)
	177	+ public BaseResponse getOneBabySieveResultQhd(String id) {
	178	+ return babySieveFacede.getOneBabySieveResultQhd(id);
	179	+ }
170	180
171	181	/**
172	182	* 修改状态

...	...	@@ -157,6 +157,9 @@
157	157	private SieveService sieveService;
158	158
159	159	@Autowired
	160	+ private BabySieveFacede babySieveFacede;
	161	+
	162	+ @Autowired
160	163	private CdfyHisService cdfyHisService;
161	164
162	165	@Autowired
...	...	@@ -247,6 +250,27 @@
247	250	@RequestMapping(value = "/babyEyeCheckUpdateBaby" , method = RequestMethod.GET)
248	251	public BaseResponse babyEyeCheckUpdateBaby(@RequestParam(required = false) String startDate,@RequestParam(required = false) String endDate) {
249	252	return babyEyeCheckService.updateBaby(startDate, endDate);
	253	+ }
	254	+
	255	+ /**
	256	+ * 定时获取儿童筛查结果
	257	+ *
	258	+ * @Author: 武涛涛
	259	+ * @Date: 2020/12/22 17:16
	260	+ */
	261	+ @ResponseBody
	262	+ @RequestMapping(value = "/babySieveTimerWork" , method = RequestMethod.GET)
	263	+ public BaseResponse babySieveTimerWork(@RequestParam(required = false) String startDate,
	264	+ @RequestParam(required = false) String endDate,
	265	+ @RequestParam(required = false) String xsTiaoXingMa,
	266	+ @RequestParam(required = false) String msTiaoXingMa,
	267	+ @RequestParam(required = false) String id,
	268	+ @RequestParam(required = false) String babyId ) {
	269	+
	270	+ Date startDate1 = DateUtil.parseYMD(startDate);
	271	+ Date endDate1 = DateUtil.getDayLastSecond( DateUtil.parseYMD(endDate));
	272	+ babySieveFacede.babySieveList(startDate1, endDate1,xsTiaoXingMa,msTiaoXingMa,id,babyId);
	273	+ return new BaseResponse();
250	274	}
251	275
252	276	@ResponseBody

...	...	@@ -22,6 +22,7 @@
22	22	import com.lyms.platform.pojo.*;
23	23	import com.lyms.platform.query.*;
24	24	import com.mchange.v1.util.ListUtils;
	25	+import net.sf.json.JSONObject;
25	26	import org.apache.commons.collections.CollectionUtils;
26	27	import org.apache.commons.io.FileUtils;
27	28	import org.apache.commons.lang.StringUtils;
28	29
29	30
...	...	@@ -75,10 +76,13 @@
75	76	private UsersService usersService;
76	77
77	78	private static final String XS_SAVE = "http://121.22.16.246:8091/MSMS/lyms/xs_save.do";//秦皇岛新筛四项样本添加
78		- private static final String MSMS_SAVE = "http://121.22.16.246:8091/MSMS/lyms/msms_save.do";//秦皇岛串联质谱样本添加
79		-
80	79	private static final String XS_UPDATE = "http://121.22.16.246:8091/MSMS/lyms/xs_update.do";//秦皇岛新筛四项样本更新
	80	+ private static final String XSSEARCHRESULT = "http://121.22.16.246:8091/MSMS/lyms/xsSearchResult.do";//秦皇岛新筛四项结果查询接口
	81	+
	82	+ private static final String MSMS_SAVE = "http://121.22.16.246:8091/MSMS/lyms/msms_save.do";//秦皇岛串联质谱样本添加
81	83	private static final String MSMS_UPDATE = "http://121.22.16.246:8091/MSMS/lyms/msms_update.do";//秦皇岛串联质谱样本更新
	84	+ private static final String SEARCHRESULT = "http://121.22.16.246:8091/MSMS/lyms/searchResult.do";//秦皇岛串联结果查询接口
	85	+
82	86	/**
83	87	* 新生儿筛查申请前，查询孕妇是否在本院建档以及是否已经录入分娩记录
84	88	*
...	...	@@ -215,6 +219,7 @@
215	219	}
216	220
217	221	}
	222	+
218	223	/**
219	224	* 初始化机构列表
220	225	* @Author: 武涛涛
...	...	@@ -417,7 +422,6 @@
417	422	public BaseResponse addOrUpdateBabySieveQhd(BabySieveAddQhdRequest babySieveAddQhdRequest, Integer userId) {
418	423	BabySieveQhdModel babySieveQhdModel = babySieveAddQhdRequest.convertToDataModel();
419	424	String hospital = autoMatchFacade.getHospitalId(userId);
420		- babySieveQhdModel.setHospitalId(hospital);
421	425	//更新数据
422	426	if (StringUtils.isNotEmpty(babySieveAddQhdRequest.getId())) {
423	427	if (StringUtils.isNotEmpty(babySieveQhdModel.getBabyId())) {
...	...	@@ -433,6 +437,7 @@
433	437	return objectResponse;
434	438	} else {
435	439	//新增数据
	440	+ babySieveQhdModel.setHospitalId(hospital);
436	441	babySieveQhdService.addBabySieve(babySieveQhdModel);
437	442	if (StringUtils.isNotEmpty(babySieveQhdModel.getBabyId())) {
438	443	BabyModelQuery babyQuery = new BabyModelQuery();
...	...	@@ -457,6 +462,105 @@
457	462	}
458	463	}
459	464	/**
	465	+ *
	466	+ *秦皇岛医院自动获取儿童筛查数据状态
	467	+ * @Author: 武涛涛
	468	+ * @Date: 2020/12/22 13:56
	469	+ */
	470	+ public void babySieveTimerWork() {
	471	+ Date startDate1 = DateUtil.getDayFirstSecond(new Date());
	472	+ Date endDate1 = DateUtil.getDayLastSecond(new Date());
	473	+ System.out.println("start=" + startDate1 + "end=" + endDate1);
	474	+ babySieveList(startDate1, endDate1,null,null,null,null);
	475	+ }
	476	+
	477	+ public void babySieveList(Date startDate1, Date endDate1,String xsTiaoXingMa,String msTiaoXingMa,String id,String babyId) {
	478	+ BabySieveQuery babySieveQuery = new BabySieveQuery();
	479	+ babySieveQuery.setCaiXueTimeStart(startDate1);
	480	+ babySieveQuery.setCaiXueTimeEnd(endDate1);
	481	+ babySieveQuery.setXsTiaoXingMa(xsTiaoXingMa);
	482	+ babySieveQuery.setMsTiaoXingMa(msTiaoXingMa);
	483	+ babySieveQuery.setId(id);
	484	+ babySieveQuery.setBabyId(babyId);
	485	+
	486	+ List <String> listXscsjgNe = new ArrayList <>();
	487	+ listXscsjgNe.add("2");
	488	+ babySieveQuery.setXscsjgNe(listXscsjgNe);
	489	+ List <String> listClcsjgNe = new ArrayList <>();
	490	+ listClcsjgNe.add("1");
	491	+ listClcsjgNe.add("6");
	492	+ babySieveQuery.setClcsjgNe(listClcsjgNe);
	493	+
	494	+ List <BabySieveQhdModel> babySieveQhdModels = babySieveQhdService.getBabySieveQuery(babySieveQuery);
	495	+ System.out.println(babySieveQuery.convertToQuery().convertToMongoQuery());
	496	+ for(BabySieveQhdModel babySieveQhdModel:babySieveQhdModels){
	497	+ Map map = new HashMap();
	498	+ map.put("sign","774856af6fc8bbaaf00705886d512fe2");
	499	+ map.put("pid", "1553");
	500	+ String dshospitalId = XsescEnums.getYchospitalId(babySieveQhdModel.getSsHospital()).getDshospitalId();
	501	+ map.put("ssHospital",dshospitalId);
	502	+ map.put("ssHospital","1623");//测试使用1623
	503	+ try {
	504	+ //新筛四病
	505	+ if(StringUtils.isNotEmpty(babySieveQhdModel.getTestItem())){
	506	+ map.put("tiaoXingMa", babySieveQhdModel.getXsTiaoXingMa());
	507	+ String xs = HttpClientUtil.doGet(XSSEARCHRESULT, map, "utf-8", null);
	508	+ JSONObject jsonObject = JsonUtil.getObj(xs);
	509	+ if (jsonObject != null && jsonObject.get("state").equals(1)){
	510	+ BabySieveQhdModel bSieve = new BabySieveQhdModel();
	511	+ JSONObject jsonObjectData = jsonObject.getJSONObject("data");
	512	+ if(jsonObjectData!=null){
	513	+ if(jsonObjectData.get("positive").equals(0)){
	514	+ bSieve.setXscsjg("2");//（1阳性、2阴性 4召回）
	515	+ }else if(jsonObjectData.get("positive").equals(1)){
	516	+ bSieve.setXscsjg("1");
	517	+ }else if(jsonObjectData.get("recall_state").equals(1)){
	518	+ bSieve.setXscsjg("4");
	519	+ }
	520	+ bSieve.setXsresultJSON(jsonObjectData.toString()); //检查详细存储起来
	521	+ babySieveQhdService.updateBabySieveById(bSieve, babySieveQhdModel.getId());
	522	+ }
	523	+ }else {
	524	+ operateLogFacade.addModifyOptLog(null, Integer.valueOf(babySieveQhdModel.getHospitalId()),babySieveQhdModel, jsonObject, OptActionEnums.ADD.getId(), "新筛四病结果异常");
	525	+ }
	526	+
	527	+ }
	528	+ } catch (NumberFormatException e) {
	529	+ e.printStackTrace();
	530	+ }
	531	+ try {
	532	+ //串联质谱 MSMS
	533	+ if(StringUtils.isNotEmpty(babySieveQhdModel.getMsms())){
	534	+ map.put("tiaoXingMa", babySieveQhdModel.getMsTiaoXingMa());
	535	+ String xs = HttpClientUtil.doGet(SEARCHRESULT, map, "utf-8", null);
	536	+ JSONObject jsonObject = JsonUtil.getObj(xs);
	537	+ if (jsonObject != null && jsonObject.get("state").equals(1)){
	538	+ BabySieveQhdModel bSieve = new BabySieveQhdModel();
	539	+ JSONObject jsonObjectData = jsonObject.getJSONObject("data");
	540	+ if(jsonObjectData!=null){
	541	+ JSONObject patien = jsonObjectData.getJSONObject("patien");
	542	+ //串联里面Status2，1正常 2异常 4召回 6临床确诊
	543	+ if(patien!=null && patien.get("status2").equals(1)){
	544	+ bSieve.setClcsjg("2");
	545	+ }else if(patien!=null && patien.get("status2").equals(2)){
	546	+ bSieve.setClcsjg("1");
	547	+ }else if(patien!=null && patien.get("status2")!=null){
	548	+ bSieve.setClcsjg(patien.get("status2").toString());
	549	+ }
	550	+ bSieve.setClresultJSON(jsonObjectData.toString()); //检查详细存储起来
	551	+ babySieveQhdService.updateBabySieveById(bSieve, babySieveQhdModel.getId());
	552	+ }
	553	+ }else {
	554	+ operateLogFacade.addModifyOptLog(null, Integer.valueOf(babySieveQhdModel.getHospitalId()),babySieveQhdModel, jsonObject, OptActionEnums.ADD.getId(), "串联质谱结果异常");
	555	+ }
	556	+ }
	557	+ } catch (NumberFormatException e) {
	558	+ e.printStackTrace();
	559	+ }
	560	+ }
	561	+ }
	562	+
	563	+ /**
460	564	* 儿童筛查保存同步到对方系统秦皇岛
461	565	*
462	566	* @param userId
...	...	@@ -471,8 +575,8 @@
471	575	map.put("pid", "1553");
472	576	map.put("momName", babySieveQhdModel.getMomName());
473	577	String dshospitalId = XsescEnums.getYchospitalId(babySieveQhdModel.getSsHospital()).getDshospitalId();
474		-// map.put("ssHospital",dshospitalId); //测试使用1623
475		- map.put("ssHospital","1623");
	578	+ map.put("ssHospital",dshospitalId);
	579	+ map.put("ssHospital","1623");//测试使用1623
476	580	map.put("phone",babySieveQhdModel.getPhone());
477	581	map.put("zhuYuanNum", babySieveQhdModel.getZhuYuanNum());
478	582	map.put("buruSum", babySieveQhdModel.getBuruSum());
...	...	@@ -557,7 +661,9 @@
557	661	model.setMsTiaoXingMa(babySieveAddQhdRequest.getMsTiaoXingMa());//串联血卡编号:
558	662
559	663	model.setSieveStatuseNwXy(babySieveAddQhdRequest.getSieveStatuseNwXy()); //血样状态 1合格 2不合格
560		- model.setCsjg(babySieveAddQhdRequest.getCsjg());//筛查结果（1阳性、2阴性）:
	664	+ model.setXscsjg(babySieveAddQhdRequest.getXscsjg());//新筛四项筛查结果（1阳性、2阴性）:
	665	+ model.setClcsjg(babySieveAddQhdRequest.getClcsjg());//串联质谱筛查结果（1阳性、2阴性）:
	666	+
561	667	model.setPay_type(babySieveAddQhdRequest.getPay_type());//两病支付方式（1自费、2免费）
562	668	model.setClzffs(babySieveAddQhdRequest.getClzffs());//串联支付方式（1自费、2免费）
563	669	return model;
...	...	@@ -801,7 +907,8 @@
801	907	babyModelQuery.setSieveStatuseNw(babySieveAddQhdRequest.getSieveStatuseNw());
802	908	}
803	909	//筛查结果（1阳性、2阴性）
804		- babyModelQuery.setCsjg(babySieveAddQhdRequest.getCsjg());
	910	+ babyModelQuery.setClcsjg(babySieveAddQhdRequest.getClcsjg());
	911	+ babyModelQuery.setXscsjg(babySieveAddQhdRequest.getXscsjg());
805	912	//两病支付方式（1自费、2免费）
806	913	babyModelQuery.setPay_type(babySieveAddQhdRequest.getPay_type());
807	914	//串联支付方式（1自费、2免费）
...	...	@@ -892,6 +999,33 @@
892	999	}
893	1000	return br;
894	1001	}
	1002	+
	1003	+ /**
	1004	+ * 根据ID查看新生儿筛查申请结果秦皇岛版
	1005	+ *
	1006	+ * @param id
	1007	+ * @return
	1008	+ */
	1009	+ public BaseObjectResponse getOneBabySieveResultQhd(String id) {
	1010	+ BaseObjectResponse br = new BaseObjectResponse();
	1011	+ BabySieveQhdModel bm = babySieveQhdService.findOneBabySieveById(id);
	1012	+ if (bm != null) {
	1013	+ String ssHospital = "";
	1014	+ if (org.apache.commons.lang.StringUtils.isNotEmpty(bm.getSsHospital())) {
	1015	+ Organization organization = organizationService.getOrganization(Integer.parseInt(bm.getSsHospital()));
	1016	+ if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
	1017	+ ssHospital = organization.getName();
	1018	+ }
	1019	+ }
	1020	+ bm.setSsHospital(ssHospital);
	1021	+ br.setData(bm);
	1022	+ br.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION);
	1023	+ return br;
	1024	+ }
	1025	+ return br;
	1026	+ }
	1027	+
	1028	+
895	1029
896	1030
897	1031	/**

...	...	@@ -43,8 +43,10 @@
43	43	private String sieveStatuseNw;
44	44	//血样状态 1合格 2不合格
45	45	private String sieveStatuseNwXy;
46		- //筛查结果（1阳性、2阴性）:
47		- private String csjg;
	46	+ //新筛四项筛查结果（1阳性、2阴性 4召回）
	47	+ private String xscsjg;
	48	+ //串联质谱筛查结果（1阳性、2阴性 4召回 6临床确诊）
	49	+ private String clcsjg;
48	50
49	51
50	52	/筛查信息/
51	53
52	54
...	...	@@ -152,14 +154,22 @@
152	154	this.sieveStatuseNwXy = sieveStatuseNwXy;
153	155	}
154	156
155		- public String getCsjg() {
156		- return csjg;
	157	+ public String getXscsjg() {
	158	+ return xscsjg;
157	159	}
158	160
159		- public void setCsjg(String csjg) {
160		- this.csjg = csjg;
	161	+ public void setXscsjg(String xscsjg) {
	162	+ this.xscsjg = xscsjg;
161	163	}
162	164
	165	+ public String getClcsjg() {
	166	+ return clcsjg;
	167	+ }
	168	+
	169	+ public void setClcsjg(String clcsjg) {
	170	+ this.clcsjg = clcsjg;
	171	+ }
	172	+
163	173	public String getTestItem() {
164	174	return testItem;
165	175	}
...	...	@@ -432,7 +442,8 @@
432	442	babySieveQhdModel.setHospitalId(hospitalId);
433	443	babySieveQhdModel.setSieveStatuseNw(sieveStatuseNw);
434	444	babySieveQhdModel.setSieveStatuseNwXy(sieveStatuseNwXy);
435		- babySieveQhdModel.setCsjg(csjg);
	445	+ babySieveQhdModel.setClcsjg(clcsjg);
	446	+ babySieveQhdModel.setXscsjg(xscsjg);
436	447	babySieveQhdModel.setTestItem(testItem);
437	448	babySieveQhdModel.setMsms(msms);
438	449	babySieveQhdModel.setXsTiaoXingMa(xsTiaoXingMa);

...	...	@@ -43,8 +43,10 @@
43	43	private String operationCause;
44	44	//申请状态
45	45	private String sieveStatuseNw;
46		- //筛查结果
47		- private String result;
	46	+ //新筛四项筛查结果
	47	+ private String resultXscsjg;
	48	+ //串联质谱筛查结果
	49	+ private String resultClcsjg;
48	50	//采血日期
49	51	private String caiXueTime;
50	52
51	53
...	...	@@ -243,12 +245,20 @@
243	245	this.sieveStatuseNw = sieveStatuseNw;
244	246	}
245	247
246		- public String getResult() {
247		- return result;
	248	+ public String getResultXscsjg() {
	249	+ return resultXscsjg;
248	250	}
249	251
250		- public void setResult(String result) {
251		- this.result = result;
	252	+ public void setResultXscsjg(String resultXscsjg) {
	253	+ this.resultXscsjg = resultXscsjg;
	254	+ }
	255	+
	256	+ public String getResultClcsjg() {
	257	+ return resultClcsjg;
	258	+ }
	259	+
	260	+ public void setResultClcsjg(String resultClcsjg) {
	261	+ this.resultClcsjg = resultClcsjg;
252	262	}
253	263
254	264	public String getmName() {

...	...	@@ -87,11 +87,24 @@
87	87	bb = false;
88	88	}
89	89	/这几个在产筛申请中获取/
90		- if("1".equals(babySieveQhdModel.getCsjg())){
91		- babySieveQhdManager.setResult("阳性");
92		- }else if("2".equals(babySieveQhdModel.getCsjg())){
93		- babySieveQhdManager.setResult("阴性");//筛查结果
	90	+ if("1".equals(babySieveQhdModel.getXscsjg())){
	91	+ babySieveQhdManager.setResultXscsjg("阳性");
	92	+ }else if("2".equals(babySieveQhdModel.getXscsjg())){
	93	+ babySieveQhdManager.setResultXscsjg("阴性");
	94	+ }else if("4".equals(babySieveQhdModel.getXscsjg())){
	95	+ babySieveQhdManager.setResultXscsjg("召回");
94	96	}
	97	+
	98	+ if("1".equals(babySieveQhdModel.getClcsjg())){
	99	+ babySieveQhdManager.setResultClcsjg("阳性");
	100	+ }else if("2".equals(babySieveQhdModel.getClcsjg())){
	101	+ babySieveQhdManager.setResultClcsjg("阴性");
	102	+ }else if("4".equals(babySieveQhdModel.getXscsjg())){
	103	+ babySieveQhdManager.setResultXscsjg("召回");
	104	+ }else if("6".equals(babySieveQhdModel.getXscsjg())){
	105	+ babySieveQhdManager.setResultXscsjg("临床确诊");
	106	+ }
	107	+
95	108	if(StringUtils.isNotEmpty(babySieveQhdModel.getSsHospital())){
96	109	// babySieveQhdManager.setSsHospital(organizationService.getOrganizationName(babySieveQhdModel.getSsHospital()));
97	110	babySieveQhdManager.setSsHospital(babySieveQhdModel.getSsHospital());//所属医院是当前医院

...	...	@@ -126,6 +126,15 @@
126	126	<property name="concurrent" value="false"></property>
127	127	</bean>
128	128
	129	+ <!-- 秦皇岛医院自动获取儿童筛查数据状态-->
	130	+ <bean id="babySieveQhdTimerWork" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
	131	+ <!-- 要调用的bean -->
	132	+ <property name="targetObject" ref="babySieveFacede"></property>
	133	+ <!-- 要调用的Method -->
	134	+ <property name="targetMethod" value="babySieveTimerWork"></property>
	135	+ <!-- 是否并发,false表示如果发生错误也不影响下一次的调用 -->
	136	+ <property name="concurrent" value="false"></property>
	137	+ </bean>
129	138
130	139	<!-- 秦皇岛医院分娩接口-->
131	140	<bean id="qhdFmTimerWork" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
...	...	@@ -213,7 +222,12 @@
213	222	<property name="cronExpression" value="0 0 0/1 * * ? "></property>
214	223	<!--<property name="cronExpression" value="0/5 * * * * ? "></property>-->
215	224	</bean>
216		-
	225	+ <!-- 配置一个触发器 0 0 0/1 * * ?-->
	226	+ <bean id="babySieveQhdTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
	227	+ <property name="jobDetail" ref="babySieveQhdTimerWork"></property>
	228	+ <property name="cronExpression" value="0 0 0 * * ? "></property>
	229	+ <!--<property name="cronExpression" value="0/5 * * * * ? "></property>-->
	230	+ </bean>
217	231	<!-- 配置一个触发器 0 0 1 * * ?-->
218	232	<bean id="qhdFmHistoryTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
219	233	<property name="jobDetail" ref="qhdFmHistoryTimerWork"></property>
...	...	@@ -513,6 +527,7 @@
513	527	<bean id="schedulerFactory" class="org.springframework.scheduling.quartz.SchedulerFactoryBean">
514	528	<property name="triggers" >
515	529	<list>
	530	+ <!--<ref bean="babySieveQhdTrigger"/>-->
516	531	<ref bean="qhdChuZhengTrigger"/>
517	532
518	533	<ref bean="autoMatDeliverTrigger"/>