Merge branch 'master' of http://git.shengws.com/csx/gdyb

controllers/sg/his_api_controller.go

@@ -3575,21 +3575,21 @@ func (c *HisApiController) GetUploadInfo() {
 			//江苏地区国家医保医疗类别
 			//职工透析：医疗类别选特殊情况门诊9933
 			//居民血透门慢： 医疗类别选门诊慢病1402
-			var med_type string
-			if his.Insutype == "310" {
-				if reg_type == 14 {
-					med_type = "9933"
-				} else if reg_type == 11 {
-					med_type = "11"
-
-				}
-			} else if his.Insutype == "390" {
-				if reg_type == 14 {
-					med_type = "1402"
-				} else if reg_type == 11 {
-					med_type = "11"
-				}
-			}
+			//var med_type string
+			//if his.Insutype == "310" {
+			//	if reg_type == 14 {
+			//		med_type = "9933"
+			//	} else if reg_type == 11 {
+			//		med_type = "11"
+			//
+			//	}
+			//} else if his.Insutype == "390" {
+			//	if reg_type == 14 {
+			//		med_type = "1402"
+			//	} else if reg_type == 11 {
+			//		med_type = "11"
+			//	}
+			//}
 
 			data := make(map[string]interface{})
 			client := &http.Client{}
@@ -4203,21 +4203,21 @@ func (c *HisApiController) GetUploadInfo() {
 							//江苏地区国家医保医疗类别
 							//职工透析：医疗类别选特殊情况门诊9933
 							//居民血透门慢： 医疗类别选门诊慢病1402
-							var med_type string
-							if his.Insutype == "310" {
-								if reg_type == 14 {
-									med_type = "9933"
-								} else if reg_type == 11 {
-									med_type = "11"
-
-								}
-							} else if his.Insutype == "390" {
-								if reg_type == 14 {
-									med_type = "1402"
-								} else if reg_type == 11 {
-									med_type = "11"
-								}
-							}
+							//var med_type string
+							//if his.Insutype == "310" {
+							//	if reg_type == 14 {
+							//		med_type = "9933"
+							//	} else if reg_type == 11 {
+							//		med_type = "11"
+							//
+							//	}
+							//} else if his.Insutype == "390" {
+							//	if reg_type == 14 {
+							//		med_type = "1402"
+							//	} else if reg_type == 11 {
+							//		med_type = "11"
+							//	}
+							//}
 							//psn_info.VerifyNumber = strings.Replace(psn_info.VerifyNumber, "+", "%2B", -1)
 
 							api := "http://192.168.3.111:9532/" + "jsyb/2207?psn_no=" + his.PsnNo + "&mdtrt_id=" +
@@ -4585,21 +4585,21 @@ func (c *HisApiController) GetUploadInfo() {
 				//江苏地区国家医保医疗类别
 				//职工透析：医疗类别选特殊情况门诊9933
 				//居民血透门慢： 医疗类别选门诊慢病1402
-				var med_type string
-				if his.Insutype == "310" {
-					if reg_type == 14 {
-						med_type = "9933"
-					} else if reg_type == 11 {
-						med_type = "11"
-
-					}
-				} else if his.Insutype == "390" {
-					if reg_type == 14 {
-						med_type = "1402"
-					} else if reg_type == 11 {
-						med_type = "11"
-					}
-				}
+				//var med_type string
+				//if his.Insutype == "310" {
+				//	if reg_type == 14 {
+				//		med_type = "9933"
+				//	} else if reg_type == 11 {
+				//		med_type = "11"
+				//
+				//	}
+				//} else if his.Insutype == "390" {
+				//	if reg_type == 14 {
+				//		med_type = "1402"
+				//	} else if reg_type == 11 {
+				//		med_type = "11"
+				//	}
+				//}
 
 				api := "http://192.168.3.111:9532/" + "jsyb/2207?psn_no=" + his.PsnNo + "&mdtrt_id=" +
 					his.Number + "&chrg_bchno=" + chrg_bchno + "&org_name=" + miConfig.OrgName +
@@ -5440,21 +5440,21 @@ func (c *HisApiController) GetPreUploadInfo() {
 		//江苏地区国家医保医疗类别
 		//职工透析：医疗类别选特殊情况门诊9933
 		//居民血透门慢： 医疗类别选门诊慢病1402
-		var med_type string
-		if his.Insutype == "310" {
-			if reg_type == 14 {
-				med_type = "9933"
-			} else if reg_type == 11 {
-				med_type = "11"
-
-			}
-		} else if his.Insutype == "390" {
-			if reg_type == 14 {
-				med_type = "1402"
-			} else if reg_type == 11 {
-				med_type = "11"
-			}
-		}
+		//var med_type string
+		//if his.Insutype == "310" {
+		//	if reg_type == 14 {
+		//		med_type = "9933"
+		//	} else if reg_type == 11 {
+		//		med_type = "11"
+		//
+		//	}
+		//} else if his.Insutype == "390" {
+		//	if reg_type == 14 {
+		//		med_type = "1402"
+		//	} else if reg_type == 11 {
+		//		med_type = "11"
+		//	}
+		//}
 
 		data := make(map[string]interface{})
 		client := &http.Client{}
@@ -6008,21 +6008,21 @@ func (c *HisApiController) GetPreUploadInfo() {
 						//江苏地区国家医保医疗类别
 						//职工透析：医疗类别选特殊情况门诊9933
 						//居民血透门慢： 医疗类别选门诊慢病1402
-						var med_type string
-						if his.Insutype == "310" {
-							if reg_type == 14 {
-								med_type = "9933"
-							} else if reg_type == 11 {
-								med_type = "11"
-
-							}
-						} else if his.Insutype == "390" {
-							if reg_type == 14 {
-								med_type = "1402"
-							} else if reg_type == 11 {
-								med_type = "11"
-							}
-						}
+						//var med_type string
+						//if his.Insutype == "310" {
+						//	if reg_type == 14 {
+						//		med_type = "9933"
+						//	} else if reg_type == 11 {
+						//		med_type = "11"
+						//
+						//	}
+						//} else if his.Insutype == "390" {
+						//	if reg_type == 14 {
+						//		med_type = "1402"
+						//	} else if reg_type == 11 {
+						//		med_type = "11"
+						//	}
+						//}
 
 						api := "http://192.168.3.111:9532/" + "jsyb/2206?psn_no=" + his.PsnNo + "&mdtrt_id=" +
 							his.Number + "&chrg_bchno=" + chrg_bchno + "&org_name=" + miConfig.OrgName +