jiangjiazhi / regional-platform

Commit be2b5c23f63968b4416cf95f29920fd7b72e2d24

Authored by liquanyu almost 5 years ago

Exists in master and in 6 other branches

update

Showing 2 changed files with 28 additions and 9 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java

...	...	@@ -421,7 +421,7 @@
421	421	// 调用华大接口
422	422	Boolean aBoolean = callHuaDa(sieveApplyOrderModel, hospitalId);
423	423	String number = sieveApplyOrderModel.getNumber();
424		- if (aBoolean != null && StringUtils.isNotEmpty(number)) {
	424	+ if (aBoolean != null && StringUtils.isNotEmpty(number) && aBoolean) {
425	425	mongoTemplate.updateFirst(Query.query(Criteria.where("number").is(number)), Update.update("huaDaPushResult", aBoolean), SieveApplyOrderModel.class);
426	426	}
427	427
...	...	@@ -606,6 +606,7 @@
606	606	if (CollectionUtils.isNotEmpty(sieveApplyOrderModels)) {
607	607	int size = sieveApplyOrderModels.size();
608	608	if (size > 1) {
	609	+ sieveApplyOrderModel.setLymsSieveId(sieveApplyOrderModels.get(0).getLymsSieveId());
609	610	return true;
610	611	}
611	612	SieveApplyOrderModel model = sieveApplyOrderModels.get(0);
...	...	@@ -613,6 +614,7 @@
613	614	String modelIdWeb = sieveApplyOrderModel.getId();
614	615	if (StringUtils.isNotEmpty(modelIdWeb)) {
615	616	if (!modelIdDB.equals(modelIdWeb)) {
	617	+ sieveApplyOrderModel.setLymsSieveId(model.getLymsSieveId());
616	618	return true;
617	619	}
618	620	} else {
...	...	@@ -1857,6 +1859,9 @@
1857	1859	}
1858	1860	String data = null;
1859	1861	try {
	1862	+
	1863	+
	1864	+
1860	1865	//5.3.查询报告详情
1861	1866	Map<String, Object> signParams = getSignParams(SYSCODE, SECRET);
1862	1867	String timestamp1 = signParams.get("timestamp").toString();
1863	1868
1864	1869
...	...	@@ -1874,13 +1879,22 @@
1874	1879	JSONObject jsonObject = JSONObject.parseObject(data);
1875	1880	Object rows = jsonObject.get("rows");
1876	1881	HuadaCallbackModel huadaCallbackModel = JSONObject.parseObject(rows.toString(), HuadaCallbackModel.class);
1877		- System.out.println(huadaCallbackModel.toString());
1878	1882
	1883	+ SieveApplyOrderModel sieveApplyOrderModel = new SieveApplyOrderModel();
	1884	+ sieveApplyOrderModel.setNumber(huadaCallbackModel.getSampleNum());
	1885	+ boolean existTwo = exists(sieveApplyOrderModel);
	1886	+ if (!existTwo) {
	1887	+ map.put("code", "500");
	1888	+ map.put("msg", "标本号不存在");
	1889	+ return map;
	1890	+ }
	1891	+
	1892	+
1879	1893	String cardId = huadaCallbackModel.getCardId();
1880	1894	Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("cardNo").is(cardId)), Patients.class);
1881	1895	if (patients != null) {
1882	1896	String patientsId = patients.getId();
1883		- SieveResultModel model = getSieveResultModel(huadaCallbackModel, patientsId);
	1897	+ SieveResultModel model = getSieveResultModel(huadaCallbackModel, patientsId,sieveApplyOrderModel.getLymsSieveId());
1884	1898	List<SieveResultModel> sieveResultModels = mongoTemplate.find(Query.query(Criteria.where("sampleReportId").is(model.getSampleReportId())).with(new Sort(Sort.Direction.DESC, "resultTime")), SieveResultModel.class);
1885	1899	if (CollectionUtils.isNotEmpty(sieveResultModels)) {
1886	1900	SieveResultModel sieveResultModel = sieveResultModels.get(0);
1887	1901
...	...	@@ -1931,8 +1945,9 @@
1931	1945	* @param patientsId
1932	1946	* @return
1933	1947	*/
1934		- private SieveResultModel getSieveResultModel(final HuadaCallbackModel huadaCallbackModel, String patientsId) {
	1948	+ private SieveResultModel getSieveResultModel(final HuadaCallbackModel huadaCallbackModel, String patientsId,String sieveId) {
1935	1949	SieveResultModel newModel = new SieveResultModel();
	1950	+ newModel.setLymsSieveId(sieveId);
1936	1951	newModel.setResultTime(new Date());
1937	1952	newModel.setReportType("1");
1938	1953	newModel.setParentId(patientsId);
...	...	@@ -2208,7 +2223,7 @@
2208	2223	JSONObject jsonObject = JSONObject.parseObject(data);
2209	2224	Object codeObj = jsonObject.get("code");
2210	2225	if (codeObj != null && "200".equals(codeObj.toString()) && data.contains("success")) {
2211		- dohandleResult(jsonObject.get("data"));
	2226	+ dohandleResult(jsonObject.get("data"),sieveApplyOrderModel.getLymsSieveId());
2212	2227	break;
2213	2228	}
2214	2229	}
...	...	@@ -2229,7 +2244,7 @@
2229	2244	return baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功!");
2230	2245	}
2231	2246
2232		- private void dohandleResult(final Object dataObj) {
	2247	+ private void dohandleResult(final Object dataObj,final String sieveId) {
2233	2248	if (dataObj == null) {
2234	2249	return;
2235	2250	}
...	...	@@ -2244,7 +2259,7 @@
2244	2259	if (patients != null) {
2245	2260	String patientsId = patients.getId();
2246	2261	huadaCallbackModel.setSampleReportId(huadaCallbackModel.getSampleNum());
2247		- SieveResultModel model = getSieveResultModel(huadaCallbackModel, patientsId);
	2262	+ SieveResultModel model = getSieveResultModel(huadaCallbackModel, patientsId,sieveId);
2248	2263	List<SieveResultModel> sieveResultModels = mongoTemplate.find(Query.query(Criteria.where("sampleReportId").is(model.getSampleReportId())).with(new Sort(Sort.Direction.DESC, "resultTime")), SieveResultModel.class);
2249	2264	if (CollectionUtils.isNotEmpty(sieveResultModels)) {
2250	2265	SieveResultModel sieveResultModel = sieveResultModels.get(0);

...	...	@@ -436,9 +436,13 @@
436	436	usersQuery.setOrgId(dbuser.getOrgId());
437	437	usersQuery.setEnable(1);
438	438	//秦皇岛提出只查询当前用户所在部门的所有用户
439		- if (dbuser != null && dbuser.getDeptId() != null)
	439	+ String hospital = autoMatchFacade.getHospitalId(id);
	440	+ if ("216".equals(hospital))
440	441	{
441		- usersQuery.setDeptId(dbuser.getDeptId());
	442	+ if (dbuser != null && dbuser.getDeptId() != null)
	443	+ {
	444	+ usersQuery.setDeptId(dbuser.getDeptId());
	445	+ }
442	446	}
443	447	List<Users> users = usersService.queryUsers(usersQuery);
444	448