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

controllers/sg/his_api_controller.go

@@ -1283,11 +1283,11 @@ func (c *HisApiController) GetSettleListHospital() {
 	}
 	struct4101.CustomStruct = tempFunPays
 
-	var tempOpspdiseinfos []service.OpspdiseinfoStruct
+	var tempDiaginfos []service.DiaginfoStructTwo
 	var tempOpspdiseinfo2 service.OpspdiseinfoStruct
-	//sickConfig, _ := service.FindDiagnoseById(his.Diagnosis)
+	var tempOpspdiseinfos []service.OpspdiseinfoStruct
 
-	diagnosis_ids := strings.Split(his.Diagnosis, ",")
+	diagnosis_ids := strings.Split(order.Diagnosis, ",")
 	var config []*models.HisXtDiagnoseConfig
 	for _, item := range diagnosis_ids {
 		id, _ := strconv.ParseInt(item, 10, 64)
@@ -1295,20 +1295,28 @@ func (c *HisApiController) GetSettleListHospital() {
 		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)
+	for index, item := range config {
+		if index == 0 {
+			var tempDiaginfo service.DiaginfoStructTwo
+			tempDiaginfo.DiagCode = item.CountryCode
+			tempDiaginfo.DiagName = item.CountryContentName
+			tempDiaginfo.DiagType = "1"
+			tempDiaginfo.MaindiagFlag = "1"
+			tempDiaginfos = append(tempDiaginfos, tempDiaginfo)
+		} else {
+
+			var tempDiaginfo service.DiaginfoStructTwo
+			tempDiaginfo.DiagCode = item.CountryCode
+			tempDiaginfo.DiagName = item.CountryContentName
+			tempDiaginfo.DiagType = "2"
+			tempDiaginfo.MaindiagFlag = "0"
+			tempDiaginfos = append(tempDiaginfos, tempDiaginfo)
+		}
 	}
 
 	sickConfigTwo, _ := service.FindSickById(his.SickType)
 	tempOpspdiseinfo2.DiagCode = sickConfigTwo.ContentCode
 	tempOpspdiseinfo2.DiagName = sickConfigTwo.CountryContentName
-	tempOpspdiseinfo2.MaindiagFlag = "2"
 	tempOpspdiseinfo2.OprnOprtCode = ""
 	tempOpspdiseinfo2.OprnOprtName = ""
 	tempOpspdiseinfos = append(tempOpspdiseinfos, tempOpspdiseinfo2)