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

controllers/sg/his_api_controller.go

@@ -1835,6 +1835,7 @@ func (c *HisApiController) GetBatchSettleList() {
 				tempDiaginfos = append(tempDiaginfos, tempDiaginfo)
 			}
 		}
+
 		sickConfigTwo, _ := service.FindSickById(his.SickType)
 		tempOpspdiseinfo2.DiagCode = sickConfigTwo.ContentCode
 		tempOpspdiseinfo2.DiagName = sickConfigTwo.CountryContentName