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

controllers/zh/zh_his_api_controller.go

@@ -637,6 +637,17 @@ func (c *ZHHisApiController) GetSettleInfo() {
 	var is390 int = 0
 	var is310 int = 0
 
+	if record.ID == 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+
+	}
+
+	if record.InHospitalStatus == 1 && record.OutHospitalStatus == 1 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHospitalNoExistDataException)
+		return
+	}
+
 	for _, item := range rf {
 		if (item.Insutype == "390" && item.PsnInsuStas == "1") || (item.Insutype == "310" && item.PsnInsuStas == "1") {
 			insutypes = append(insutypes, item.Insutype)
@@ -836,7 +847,12 @@ func (c *ZHHisApiController) GetUploadInfo() {
 	roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
 	record, _ := service.GetInHospitalRecord(in_hospital_id)
 
-	if record.InHospitalStatus == 1 && record.OutHospitalStatus == 1 {
+	if record.ID == 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+
+	if record.InHospitalStatus == 1 && record.OutHospitalStatus == 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHospitalNoExistDataException)
 		return
 	}