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

controllers/sg/his_api_controller.go

@@ -3328,14 +3328,14 @@ func (c *HisApiController) GetUploadInfo() {
 					var med_type string
 					if his.Insutype == "390" {
 						if reg_type == 14 {
-							med_type = "140104"
+							med_type = "14"
 						} else if reg_type == 11 {
 							med_type = "11"
 
 						}
 					} else if his.Insutype == "310" {
 						if reg_type == 14 {
-							med_type = "140104"
+							med_type = "14"
 						} else if reg_type == 11 {
 							med_type = "11"
 						}
@@ -3825,13 +3825,13 @@ func (c *HisApiController) GetUploadInfo() {
 								var med_type string
 								if his.Insutype == "390" {
 									if reg_type == 14 {
-										med_type = "140104"
+										med_type = "14"
 									} else if reg_type == 11 {
 										med_type = "11"
 									}
 								} else if his.Insutype == "310" {
 									if reg_type == 14 {
-										med_type = "140104"
+										med_type = "14"
 									} else if reg_type == 11 {
 										med_type = "11"
 									}
@@ -4126,13 +4126,13 @@ func (c *HisApiController) GetUploadInfo() {
 					var med_type string
 					if his.Insutype == "390" {
 						if reg_type == 14 {
-							med_type = "140104"
+							med_type = "14"
 						} else if reg_type == 11 {
 							med_type = "11"
 						}
 					} else if his.Insutype == "310" {
 						if reg_type == 14 {
-							med_type = "140104"
+							med_type = "14"
 						} else if reg_type == 11 {
 							med_type = "11"
 						}
@@ -4911,13 +4911,13 @@ func (c *HisApiController) GetPreUploadInfo() {
 				var med_type string
 				if his.Insutype == "390" {
 					if reg_type == 14 {
-						med_type = "140104"
+						med_type = "14"
 					} else if reg_type == 11 {
 						med_type = "11"
 					}
 				} else if his.Insutype == "310" {
 					if reg_type == 14 {
-						med_type = "140104"
+						med_type = "14"
 					} else if reg_type == 11 {
 						med_type = "11"
 					}
@@ -5350,13 +5350,13 @@ func (c *HisApiController) GetPreUploadInfo() {
 							var med_type string
 							if his.Insutype == "390" {
 								if reg_type == 14 {
-									med_type = "140104"
+									med_type = "14"
 								} else if reg_type == 11 {
 									med_type = "11"
 								}
 							} else if his.Insutype == "310" {
 								if reg_type == 14 {
-									med_type = "140104"
+									med_type = "14"
 								} else if reg_type == 11 {
 									med_type = "11"
 								}