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

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 = "14"
+				struct2401.MedType = "990502"
 			} else if med_type == 11 {
 				struct2401.MedType = "11"
 
@@ -866,8 +866,8 @@ func (c *ZHHisApiController) GetZHInHospitalCheck() {
 		}
 
 		if res.Infcode == 0 {
-			result2 := service.Gdyb5301Two(res2.Output.Baseinfo.PsnNo, miConfig.OrgName, role.UserName, miConfig.Code, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey)
-			fmt.Println(result2)
+			//result2 := service.Gdyb5301Two(res2.Output.Baseinfo.PsnNo, miConfig.OrgName, role.UserName, miConfig.Code, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey)
+			//fmt.Println(result2)
 			Iinfos, _ := json.Marshal(res2.Output.Iinfo)
 			Idetinfos, _ := json.Marshal(res2.Output.Idetinfo)
 			infoStr := string(Iinfos)
@@ -1346,7 +1346,7 @@ func (c *ZHHisApiController) GetUploadInfo() {
 	}
 	if miConfig.Code == "H15049901371" {
 		if record.MedType == 14 {
-			data["med_type"] = "14"
+			data["med_type"] = "990502"
 
 		} else if record.MedType == 11 {