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

controllers/sg/his_api_controller.go

@@ -735,7 +735,7 @@ func (c *HisApiController) GetSettleList() {
 	struct4101.CustomStruct = tempFunPays
 
 	var tempOpspdiseinfos []service.OpspdiseinfoStruct
-	var tempOpspdiseinfo2 service.OpspdiseinfoStruct
+	//var tempOpspdiseinfo2 service.OpspdiseinfoStruct
 	//sickConfig, _ := service.FindDiagnoseById(his.Diagnosis)
 
 	diagnosis_ids := strings.Split(his.Diagnosis, ",")
@@ -756,13 +756,13 @@ func (c *HisApiController) GetSettleList() {
 		tempOpspdiseinfos = append(tempOpspdiseinfos, tempOpspdiseinfo)
 	}
 
-	sickConfigTwo, _ := service.FindSickById(his.SickType)
-	tempOpspdiseinfo2.DiagCode = sickConfigTwo.ContentCode
-	tempOpspdiseinfo2.DiagName = sickConfigTwo.CountryContentName
-	tempOpspdiseinfo2.MaindiagFlag = "2"
-	tempOpspdiseinfo2.OprnOprtCode = ""
-	tempOpspdiseinfo2.OprnOprtName = ""
-	tempOpspdiseinfos = append(tempOpspdiseinfos, tempOpspdiseinfo2)
+	//sickConfigTwo, _ := service.FindSickById(his.SickType)
+	//tempOpspdiseinfo2.DiagCode = sickConfigTwo.ContentCode
+	//tempOpspdiseinfo2.DiagName = sickConfigTwo.CountryContentName
+	//tempOpspdiseinfo2.MaindiagFlag = "2"
+	//tempOpspdiseinfo2.OprnOprtCode = ""
+	//tempOpspdiseinfo2.OprnOprtName = ""
+	//tempOpspdiseinfos = append(tempOpspdiseinfos, tempOpspdiseinfo2)
 	struct4101.OpspdiseinfoStruct = tempOpspdiseinfos
 
 	var iteminfo service.IteminfoStruct