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

controllers/sg/his_api_controller.go

@@ -738,23 +738,22 @@ func (c *HisApiController) GetSettleList() {
 	var tempOpspdiseinfo2 service.OpspdiseinfoStruct
 	//sickConfig, _ := service.FindDiagnoseById(his.Diagnosis)
 
-	//diagnosis_ids := strings.Split(his.Diagnosis, ",")
-	//var config []*models.HisXtDiagnoseConfig
-	//for _, item := range diagnosis_ids {
-	//	id, _ := strconv.ParseInt(item, 10, 64)
-	//	diagnosisConfig, _ := service.FindDiagnoseById(id)
-	//	config = append(config, &diagnosisConfig)
-	//}
-	//
-	//for _, item := range config {
-	//	var tempOpspdiseinfo service.OpspdiseinfoStruct
-	//	tempOpspdiseinfo.DiagCode = item.CountryCode
-	//	tempOpspdiseinfo.DiagName = item.CountryContentName
-	//	tempOpspdiseinfo.MaindiagFlag = "1"
-	//	tempOpspdiseinfo.OprnOprtCode = ""
-	//	tempOpspdiseinfo.OprnOprtName = ""
-	//	tempOpspdiseinfos = append(tempOpspdiseinfos, tempOpspdiseinfo)
-	//}
+	diagnosis_ids := strings.Split(his.Diagnosis, ",")
+	var config []*models.HisXtDiagnoseConfig
+	for _, item := range diagnosis_ids {
+		id, _ := strconv.ParseInt(item, 10, 64)
+		diagnosisConfig, _ := service.FindDiagnoseById(id)
+		config = append(config, &diagnosisConfig)
+	}
+	for _, item := range config {
+		var tempOpspdiseinfo service.OpspdiseinfoStruct
+		tempOpspdiseinfo.DiagCode = item.CountryCode
+		tempOpspdiseinfo.DiagName = item.CountryContentName
+		tempOpspdiseinfo.MaindiagFlag = "1"
+		tempOpspdiseinfo.OprnOprtCode = ""
+		tempOpspdiseinfo.OprnOprtName = ""
+		tempOpspdiseinfos = append(tempOpspdiseinfos, tempOpspdiseinfo)
+	}
 
 	sickConfigTwo, _ := service.FindSickById(his.SickType)
 	tempOpspdiseinfo2.DiagCode = sickConfigTwo.ContentCode