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

controllers/sg/his_api_controller.go

@@ -779,6 +779,7 @@ func (c *HisApiController) GetSettleList() {
 			tempDiaginfos = append(tempDiaginfos, tempDiaginfo)
 		}
 	}
+	struct4101.Diseinfo = tempDiaginfos
 
 	sickConfigTwo, _ := service.FindSickById(his.SickType)
 	tempOpspdiseinfo2.DiagCode = sickConfigTwo.ContentCode
@@ -1286,8 +1287,7 @@ func (c *HisApiController) GetSettleListHospital() {
 	var tempDiaginfos []service.DiaginfoStructTwo
 	var tempOpspdiseinfo2 service.OpspdiseinfoStruct
 	var tempOpspdiseinfos []service.OpspdiseinfoStruct
-
-	diagnosis_ids := strings.Split(order.Diagnosis, ",")
+	diagnosis_ids := strings.Split(his.Diagnosis, ",")
 	var config []*models.HisXtDiagnoseConfig
 	for _, item := range diagnosis_ids {
 		id, _ := strconv.ParseInt(item, 10, 64)