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

controllers/sg/his_api_controller.go

@@ -1313,6 +1313,7 @@ func (c *HisApiController) GetSettleListHospital() {
 			tempDiaginfos = append(tempDiaginfos, tempDiaginfo)
 		}
 	}
+	struct4101.Diseinfo = tempDiaginfos
 
 	sickConfigTwo, _ := service.FindSickById(his.SickType)
 	tempOpspdiseinfo2.DiagCode = sickConfigTwo.ContentCode
@@ -1852,6 +1853,7 @@ func (c *HisApiController) GetBatchSettleList() {
 				tempDiaginfos = append(tempDiaginfos, tempDiaginfo)
 			}
 		}
+		struct4101.Diseinfo = tempDiaginfos
 
 		sickConfigTwo, _ := service.FindSickById(his.SickType)
 		tempOpspdiseinfo2.DiagCode = sickConfigTwo.ContentCode