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

controllers/sg/his_api_controller.go

@@ -7703,7 +7703,8 @@ func (c *HisApiController) PsnPutNCDSOnRecord() {
 			return
 		}
 		res.ErrMsg = res10265.ErrMsg
-		res.Output = res10265.Output
+		infocode, _ := strconv.ParseInt(res10265.Infcode, 10, 64)
+		res.Infcode = infocode
 		res.InfRefmsgid = res10265.InfRefmsgid
 
 	} else {
@@ -7859,6 +7860,8 @@ func (c *HisApiController) PsnPutUnNCDSOnRecord() {
 			return
 		}
 		res.ErrMsg = res10265.ErrMsg
+		infocode, _ := strconv.ParseInt(res10265.Infcode, 10, 64)
+		res.Infcode = infocode
 		res.Output = res10265.Output
 		res.InfRefmsgid = res10265.InfRefmsgid
 

controllers/zh/zh_his_api_controller.go

@@ -783,9 +783,7 @@ func (c *ZHHisApiController) GetZHInHospitalCheck() {
 				struct2401.MedType = "140104"
 			} else if med_type == 11 {
 				struct2401.MedType = "11"
-
 			}
-
 		} else {
 			struct2401.MedType = strconv.FormatInt(int64(med_type), 10)
 		}
@@ -1363,8 +1361,11 @@ func (c *ZHHisApiController) GetUploadInfo() {
 		}
 
 	} else {
-
-		data["med_type"] = strconv.FormatInt(record.MedType, 10)
+		if record.MedType == 1112 {
+			data["med_type"] = strconv.FormatInt(11, 10)
+		} else {
+			data["med_type"] = strconv.FormatInt(record.MedType, 10)
+		}
 
 	}
 	data["insuplc_admdvs"] = record.InsuplcAdmdvs