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

controllers/sg/his_api_controller.go

@@ -3825,7 +3825,7 @@ func (c *HisApiController) GetUploadInfo() {
 								var med_type string
 								if his.Insutype == "390" {
 									if reg_type == 14 {
-										med_type = "14"
+										med_type = "140104"
 									} else if reg_type == 11 {
 										med_type = "11"
 									}