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

controllers/sg/his_api_controller.go

@@ -154,6 +154,8 @@ func (c *HisApiController) GetSettleList() {
 		struct4101.CustomStruct = append(struct4101.CustomStruct, tempFunPay)
 	}
 	var tempOpspdiseinfo service.OpspdiseinfoStruct
+	var tempOpspdiseinfo2 service.OpspdiseinfoStruct
+
 	sickConfig, _ := service.FindDiagnoseById(his.Diagnosis)
 	sickConfigTwo, _ := service.FindSickById(his.SickType)
 
@@ -164,12 +166,12 @@ func (c *HisApiController) GetSettleList() {
 	tempOpspdiseinfo.OprnOprtName = ""
 	struct4101.OpspdiseinfoStruct = append(struct4101.OpspdiseinfoStruct, tempOpspdiseinfo)
 
-	tempOpspdiseinfo.DiagCode = sickConfigTwo.CountryCode
-	tempOpspdiseinfo.DiagName = sickConfigTwo.CountryContentName
-	tempOpspdiseinfo.MaindiagFlag = "1"
-	tempOpspdiseinfo.OprnOprtCode = ""
-	tempOpspdiseinfo.OprnOprtName = ""
-	struct4101.OpspdiseinfoStruct = append(struct4101.OpspdiseinfoStruct, tempOpspdiseinfo)
+	tempOpspdiseinfo2.DiagCode = sickConfigTwo.CountryCode
+	tempOpspdiseinfo2.DiagName = sickConfigTwo.CountryContentName
+	tempOpspdiseinfo2.MaindiagFlag = "1"
+	tempOpspdiseinfo2.OprnOprtCode = ""
+	tempOpspdiseinfo2.OprnOprtName = ""
+	struct4101.OpspdiseinfoStruct = append(struct4101.OpspdiseinfoStruct, tempOpspdiseinfo2)
 
 	var iteminfo service.IteminfoStruct