| 
														
															@@ -45,6 +45,16 @@ public class HisWjwMatchService { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 wjwtable = "t_si_dl_oprtn"; 
														 | 
														
														 | 
														
															                 wjwtable = "t_si_dl_oprtn"; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 type = 3; 
														 | 
														
														 | 
														
															                 type = 3; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 break; 
														 | 
														
														 | 
														
															                 break; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+            case "si_diag": 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                histable = "zd_icd_code_new"; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                wjwtable = "zd_icd_code_new"; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                type = 5; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                break; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+            case "si_surgery": 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                histable = "zd_icd9_cm3"; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                wjwtable = "zd_icd9_cm3"; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                type = 5; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                break; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             case "surgery_chargeCode": 
														 | 
														
														 | 
														
															             case "surgery_chargeCode": 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             default: 
														 | 
														
														 | 
														
															             default: 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 histable = "zd_icd9_cm3"; 
														 | 
														
														 | 
														
															                 histable = "zd_icd9_cm3"; 
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -57,6 +67,9 @@ public class HisWjwMatchService { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         if (type == 1) { 
														 | 
														
														 | 
														
															         if (type == 1) { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             hisList = dao.selectHisData(histable); 
														 | 
														
														 | 
														
															             hisList = dao.selectHisData(histable); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             wjwList = dao.selectWjwData(wjwtable); 
														 | 
														
														 | 
														
															             wjwList = dao.selectWjwData(wjwtable); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        } else if (type == 5) { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+            hisList = dao.selectYbData(histable); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+            wjwList = dao.selectYbData(wjwtable); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         } else if (type == 4) { 
														 | 
														
														 | 
														
															         } else if (type == 4) { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             hisList = dao.selectSurgeries(); 
														 | 
														
														 | 
														
															             hisList = dao.selectSurgeries(); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             wjwList = dao.selectChargeCodes(); 
														 | 
														
														 | 
														
															             wjwList = dao.selectChargeCodes(); 
														 |