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

controllers/sg/his_api_controller.go

@@ -3328,7 +3328,7 @@ 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"
 						}
@@ -3824,7 +3824,7 @@ 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"
 									}
@@ -4125,7 +4125,7 @@ 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"
 						}
@@ -4910,7 +4910,7 @@ 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"
 					}
@@ -5349,7 +5349,7 @@ 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"
 								}

controllers/zh/zh_his_api_controller.go

@@ -780,7 +780,7 @@ func (c *ZHHisApiController) GetZHInHospitalCheck() {
 		struct2401.MdtrtCertNo = res2.Output.Baseinfo.Certno
 		if miConfig.Code == "H15049901371" {
 			if med_type == 14 {
-				struct2401.MedType = "990502"
+				struct2401.MedType = "14"
 			} else if med_type == 11 {
 				struct2401.MedType = "11"
 
@@ -1344,7 +1344,7 @@ func (c *ZHHisApiController) GetUploadInfo() {
 	}
 	if miConfig.Code == "H15049901371" {
 		if record.MedType == 14 {
-			data["med_type"] = "990502"
+			data["med_type"] = "14"
 
 		} else if record.MedType == 11 {