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

controllers/sg/his_api_controller.go

@@ -1268,6 +1268,8 @@ func (c *HisApiController) GetSettleListHospital() {
 		MedinsFillPsn:  curRoles.UserName,
 		MedinsFillDept: depart.Name,
 		IptMedType:     "2",
+		AdmTime:        his.InHosptialTime,
+		AdmEndTime:     his.OutHosptialTime,
 	}
 	struct4101.SetlBegnDate = order.SetlTime
 	struct4101.SetlEndDate = order.SetlTime
@@ -2421,6 +2423,7 @@ func (c *HisApiController) GetBatchSettleList() {
 
 		}
 		struct4101.IteminfoStruct = iteminfoStructs
+
 		struct4101.Ntly = "中国"
 		struct4101.AdmCaty = "A03.06"
 		result := service.Gdyb4101(struct4101, miConfig.SecretKey, miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, c.GetAdminUserInfo().CurrentOrgId)