业务调整-银江

tran-service/src/main/java/com/diagbot/facade/PushFacade.java

@@ -67,80 +67,62 @@ public class PushFacade {
 	 */
 	public String getDataService(PushVO pushVO) {
 		PushJoinVO pushJoinVO = new PushJoinVO();
-		BeanUtil.copyProperties(pushVO, pushJoinVO);
-		//病史
-		if(pushVO.getMedicalHistory()!=null){
-			pushJoinVO.setPasts(pushVO.getMedicalHistory().getPasts());
-			pushJoinVO.setInfectious(pushVO.getMedicalHistory().getInfectious());
-			pushJoinVO.setOperation(pushVO.getMedicalHistory().getOther());
-			pushJoinVO.setAllergy(pushVO.getMedicalHistory().getAllergy());
-			pushJoinVO.setVaccination(pushVO.getMedicalHistory().getVaccination());
-			pushJoinVO.setPersonal(pushVO.getMedicalHistory().getPersonal());
-			pushJoinVO.setMarital(pushVO.getMedicalHistory().getMarital());
-			pushJoinVO.setFamily(pushVO.getMedicalHistory().getFamily());
-			pushJoinVO.setMenstrual(pushVO.getMedicalHistory().getMenstrual());
-			pushJoinVO.setOther(pushVO.getMedicalHistory().getOther());
-		}
 		pushVO.setSysType(SysTypeEnum.DATA_SERVICE.getKey());//数据服务模式
-		// 将基本参数保存到redis
-		String mrId = mrFacade.createMr(pushJoinVO);
-		// 竖版
-		String url = "";
-		String urlVer = readProperties.remoteAddressVer + "?hospitalCode=" + pushVO.getHosCode() + "&mrId=" + mrId;
-		String urlHor = readProperties.remoteAddressHor + "?hospitalCode=" + pushVO.getHosCode() + "&mrId=" + mrId;
+		BeanUtil.copyProperties(pushVO, pushJoinVO);
 
 		List<ConceptIntroduceVO> conceptIntroduceVOList = new ArrayList<ConceptIntroduceVO>();
 		List<Pacs> pacsList= Lists.newArrayList();
 		List<Lis> lisList= Lists.newArrayList();
 		List<Item> diagList= Lists.newArrayList();
+		List<Item> operationList= Lists.newArrayList();
+		List<Item> drugList= Lists.newArrayList();
 		//格式化化验、辅检、诊断
-		if (isConnect(pushVO)) {
-			// 比对映射表中的辅检项
-			if(StringUtil.isNotBlank(pushVO.getPacsOrder())){
-				//getPacsConfig(conceptIntroduceVOList, pushVO,pacs);
-				String[] pacsNames = pushVO.getPacsOrder().split("\\|");
-				if (pacsNames.length > 0) {
-					for (int i = 0; i < pacsNames.length; i++) {
-						Pacs pacs=new Pacs();
-						pacs.setName(pacsNames[i]);
-						pacsList.add(pacs);
-					}
+		// 比对映射表中的辅检项
+		if(StringUtil.isNotBlank(pushVO.getPacsOrder())){
+			String[] pacsNames = pushVO.getPacsOrder().split("\\|");
+			if (pacsNames.length > 0) {
+				for (int i = 0; i < pacsNames.length; i++) {
+					Pacs pacs=new Pacs();
+					pacs.setName(pacsNames[i]);
+					pacsList.add(pacs);
 				}
 			}
+		}
 
-			// 比对映射表中的化验项
-			if(StringUtil.isNotBlank(pushVO.getLisOrder())){
-				//getLisConfig(conceptIntroduceVOList, pushVO);
-				String[] lisNames = pushVO.getLisOrder().split("\\|");
-				if (lisNames.length > 0) {
-					for (int i = 0; i < lisNames.length; i++) {
-						Lis lis=new Lis();
-						lis.setName(lisNames[i]);
-						lisList.add(lis);
-					}
+		// 比对映射表中的化验项
+		if(StringUtil.isNotBlank(pushVO.getLisOrder())){
+			String[] lisNames = pushVO.getLisOrder().split("\\|");
+			if (lisNames.length > 0) {
+				for (int i = 0; i < lisNames.length; i++) {
+					Lis lis=new Lis();
+					lis.setName(lisNames[i]);
+					lisList.add(lis);
 				}
 			}
+		}
 
-			// 比对映射表中的诊断名称
-			if(StringUtil.isNotBlank(pushVO.getDiagOrder())){
-				//getDisease(conceptIntroduceVOList, pushVO);
-				String[] diseaseNames = pushVO.getPacsOrder().split("\\|");
-				if (diseaseNames.length > 0) {
-					for (int i = 0; i < diseaseNames.length; i++) {
-						Map<String, Object> diseaseMap = diseaseIcdFacade.getDiseaseIcdByDiseaseName(pushVO.getHosCode(), diseaseNames[i].toString());
-						if (diseaseMap!=null) {
-							String diseaseName = diseaseMap.get("concept_dis_name").toString();
-							if (StringUtil.isNotBlank(diseaseName)) {
-								ConceptIntroduceVO conceptIntroduceVO = new ConceptIntroduceVO();
-								conceptIntroduceVO.setName(diseaseName);
-								conceptIntroduceVO.setType(7);// 1-症状，5-化验，6-辅检，7-诊断，8-药品，9-药品大类，10-不良反应，11-药品小类，12-化验公表项，22-指标
-								conceptIntroduceVO.setPosition(1);// 1-摘要，2-全文，5-药品说明书，6-不良反应
-								conceptIntroduceVOList.add(conceptIntroduceVO);
+		// 比对映射表中的诊断名称
+		if(StringUtil.isNotBlank(pushVO.getDiagOrder())){
+			String[] diseaseNames = pushVO.getDiagOrder().split("\\|");
+			if (diseaseNames.length > 0) {
+				for (int i = 0; i < diseaseNames.length; i++) {
+					Map<String, Object> diseaseMap = diseaseIcdFacade.getDiseaseIcdByDiseaseName(pushVO.getHosCode(), diseaseNames[i].toString());
+					if (diseaseMap!=null) {
+						String diseaseName = diseaseMap.get("concept_dis_name").toString();
+						if (StringUtil.isNotBlank(diseaseName)) {
+							ConceptIntroduceVO conceptIntroduceVO = new ConceptIntroduceVO();
+							conceptIntroduceVO.setName(diseaseName);
+							conceptIntroduceVO.setType(7);// 1-症状，5-化验，6-辅检，7-诊断，8-药品，9-药品大类，10-不良反应，11-药品小类，12-化验公表项，22-指标
+							conceptIntroduceVO.setPosition(1);// 1-摘要，2-全文，5-药品说明书，6-不良反应
+							conceptIntroduceVOList.add(conceptIntroduceVO);
 
-								Item item=new Item();
-								item.setName(diseaseNames[i]);
-								item.setUniqueName(diseaseName);
-								diagList.add(item);
+							Item item=new Item();
+							item.setName(diseaseNames[i]);
+							item.setUniqueName(diseaseName);
+							diagList.add(item);
+
+							if(i==0){
+								pushJoinVO.setDiseaseName(item);
 							}
 						}
 					}
@@ -148,15 +130,65 @@ public class PushFacade {
 			}
 		}
 
+		// 比对映射表中的药品项
+		if(StringUtil.isNotBlank(pushVO.getDrugOrder())){
+			String[] drugNames = pushVO.getDrugOrder().split("\\|");
+			if (drugNames.length > 0) {
+				for (int i = 0; i < drugNames.length; i++) {
+					Item item=new Item();
+					item.setName(drugNames[i]);
+					item.setUniqueName(drugNames[i]);
+					drugList.add(item);
+				}
+			}
+		}
+		// 比对映射表中的药品项
+		if(StringUtil.isNotBlank(pushVO.getOperationOrder())){
+			String[] operationNames = pushVO.getOperationOrder().split("\\|");
+			if (operationNames.length > 0) {
+				for (int i = 0; i < operationNames.length; i++) {
+					Item item=new Item();
+					item.setName(operationNames[i]);
+					item.setUniqueName(operationNames[i]);
+					operationList.add(item);
+				}
+			}
+		}
+
+		//病史
+		if(pushVO.getMedicalHistory()!=null){
+			pushJoinVO.setPasts(pushVO.getMedicalHistory().getPasts());
+			pushJoinVO.setInfectious(pushVO.getMedicalHistory().getInfectious());
+			pushJoinVO.setOperation(pushVO.getMedicalHistory().getOther());
+			pushJoinVO.setAllergy(pushVO.getMedicalHistory().getAllergy());
+			pushJoinVO.setVaccination(pushVO.getMedicalHistory().getVaccination());
+			pushJoinVO.setPersonal(pushVO.getMedicalHistory().getPersonal());
+			pushJoinVO.setMarital(pushVO.getMedicalHistory().getMarital());
+			pushJoinVO.setFamily(pushVO.getMedicalHistory().getFamily());
+			pushJoinVO.setMenstrual(pushVO.getMedicalHistory().getMenstrual());
+			pushJoinVO.setOther(pushVO.getMedicalHistory().getOther());
+		}
+		pushJoinVO.setPacsOrder(pacsList);
+		pushJoinVO.setLisOrder(lisList);
+		pushJoinVO.setDiagOrder(diagList);
+		pushJoinVO.setOperationOrder(operationList);
+		pushJoinVO.setDrugOrder(drugList);
+
+		// 将基本参数保存到redis
+		String mrId = mrFacade.createMr(pushJoinVO);
+		// 竖版
+		String url = "";
+		String urlVer = readProperties.remoteAddressVer + "?hospitalCode=" + pushVO.getHosCode() + "&mrId=" + mrId;
+		String urlHor = readProperties.remoteAddressHor + "?hospitalCode=" + pushVO.getHosCode() + "&mrId=" + mrId;
 
 		// 1-症状，5-化验，6-辅检，7-诊断，8-药品，9-药品大类，10-不良反应，11-药品小类，12-化验公表项，22-指标
 		if ("hor".equalsIgnoreCase(pushVO.getShowType())) {
 			// 横版
-			urlHor += "&showTab=1&tipsInfoList=" + JSONObject.toJSONString(conceptIntroduceVOList) + "&plan=" + pushVO.getCode();
+			urlHor += "&showTab=1&tipsMode=2&tipsInfoList=" + JSONObject.toJSONString(conceptIntroduceVOList) + "&plan=" + pushVO.getCode();
 			url = urlHor;
 		} else {
 			// 竖版
-			urlVer += "&showTab=0&tipsInfoList=" + JSONObject.toJSONString(conceptIntroduceVOList) + "&plan=" + pushVO.getCode();
+			urlVer += "&showTab=0&tipsMode=2&tipsInfoList=" + JSONObject.toJSONString(conceptIntroduceVOList) + "&plan=" + pushVO.getCode();
 			url = urlVer;
 		}
 

tran-service/src/main/resources/jdbc.properties

@@ -5,8 +5,8 @@ jdbc.username=root
 jdbc.password=root
 
 #\u6570\u636e\u670d\u52a1\u6a21\u5f0f
-remote.address.ver=http://192.162.2.132:5547/index.html
-remote.address.hor=http://192.162.2.132:5547/indexHorizontal.html
+remote.address.ver=http://223.93.170.82:13247/index.html
+remote.address.hor=http://223.93.170.82:13247/indexHorizontal.html
 
 #his\u65b9\u60a3\u8005\u63a5\u53e3\u5730\u5740
 his.patient.url=