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

conf/app.conf

@@ -45,7 +45,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 10138
+org_id = 10215
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com
@@ -53,13 +53,13 @@ call_domain = https://hf.sgjyun.com
 front_end_domain = "https://xt.kuyicloud.com/#"
 #url  = "http://192.168.1.228:17001/szsi-portal/transData"
 url = "http://192.168.1.88:6666/szsi-portal/transData"
-#gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/"
-gdyb_url="http://igb.hsa.gdgov.cn/ebus/sz_prd/hsa/hgs/"
+gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/"
+#gdyb_url="http://igb.hsa.gdgov.cn/ebus/sz_prd/hsa/hgs/"
 #gdyb_paasid = "sg03_prd"
 #gdyb_paasid = "jm_sc_yjyy"
 #gdyb_paasid = "zh_prd_yjyy"
-gdyb_paasid = "sz_prd_yjyy"
-#gdyb_paasid = "zq_prd_yjyy"
+#gdyb_paasid = "sz_prd_yjyy"
+gdyb_paasid = "zq_prd_yjyy"
 
 
 readmysqlhost = shengws1.mysql.rds.aliyuncs.com

controllers/zh/zh_his_api_controller.go

@@ -1060,116 +1060,187 @@ func (c *ZHHisApiController) GetUploadInfo() {
 		}
 
 		if isSuccess == true {
-			var total float64
-			for _, item := range prescriptions {
-				if item.Type == 1 { //药品
-					for _, subItem := range item.HisDoctorAdviceInfo {
-						total = total + (subItem.Price * subItem.PrescribingNumber)
+			if settle_accounts_type == 1 {
+				for _, subItem := range ress {
+					for _, item := range subItem.Output.Result {
+						temp := strings.Split(item.FeedetlSn, "-")
+						var advice_id int64 = 0
+						var project_id int64 = 0
+						var types int64 = 0
+
+						id, _ := strconv.ParseInt(temp[2], 10, 64)
+						types, _ = strconv.ParseInt(temp[1], 10, 64)
+
+						if temp[1] == "1" {
+							advice_id = id
+							project_id = 0
+						} else if temp[1] == "2" {
+							advice_id = 0
+							project_id = id
+						}
+						info := &models.HisOrderInfo{
+							OrderNumber:      record.Number,
+							FeedetlSn:        item.FeedetlSn,
+							UploadDate:       time.Now().Unix(),
+							AdviceId:         advice_id,
+							DetItemFeeSumamt: item.DetItemFeeSumamt,
+							Cnt:              item.Cnt,
+							Pric:             float64(item.Pric),
+							PatientId:        record.PatientId,
+							PricUplmtAmt:     item.PricUplmtAmt,
+							SelfpayProp:      item.SelfpayProp,
+							FulamtOwnpayAmt:  item.FulamtOwnpayAmt,
+							OverlmtAmt:       item.OverlmtAmt,
+							PreselfpayAmt:    item.PreselfpayAmt,
+							BasMednFlag:      item.BasMednFlag,
+							MedChrgitmType:   item.MedChrgitmType,
+							HiNegoDrugFlag:   item.HiNegoDrugFlag,
+							Status:           1,
+							Memo:             item.Memo,
+							Mtime:            time.Now().Unix(),
+							InscpScpAmt:      item.InscpScpAmt,
+							DrtReimFlag:      item.DrtReimFlag,
+							Ctime:            time.Now().Unix(),
+							ListSpItemFlag:   item.ListSpItemFlag,
+							ChldMedcFlag:     item.ChldMedcFlag,
+							LmtUsedFlag:      item.LmtUsedFlag,
+							ChrgitmLv:        item.ChrgitmLv,
+							UserOrgId:        adminUser.CurrentOrgId,
+							HisPatientId:     record.ID,
+							OrderId:          0,
+							ProjectId:        project_id,
+							Type:             types,
+							SettleType:       settle_accounts_type,
+						}
+						service.CreateOrderInfo(info)
+					}
+				}
+				err := service.UpDatePrescriptionOrderStatus(adminUser.CurrentOrgId, ids)
+				if err == nil {
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg": "上传费用明细成功",
+					})
+					return
+				} else {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+					return
+				}
+
+			} else {
+				var total float64
+				for _, item := range prescriptions {
+					if item.Type == 1 { //药品
+						for _, subItem := range item.HisDoctorAdviceInfo {
+							total = total + (subItem.Price * subItem.PrescribingNumber)
+						}
+					}
+					if item.Type == 2 { //项目
+						for _, subItem := range item.HisPrescriptionProject {
+							total = total + (subItem.Price * float64(subItem.Count))
+						}
 					}
 				}
-				if item.Type == 2 { //项目
-					for _, subItem := range item.HisPrescriptionProject {
+				for _, item := range prescriptions {
+					for _, subItem := range item.HisAdditionalCharge {
 						total = total + (subItem.Price * float64(subItem.Count))
 					}
 				}
-			}
-			for _, item := range prescriptions {
-				for _, subItem := range item.HisAdditionalCharge {
-					total = total + (subItem.Price * float64(subItem.Count))
+				allTotal := fmt.Sprintf("%.2f", total)
+				totals, _ := strconv.ParseFloat(allTotal, 64)
+
+				order := &models.HisOrder{
+					UserOrgId:           adminUser.CurrentOrgId,
+					HisPatientId:        record.ID,
+					PatientId:           record.PatientId,
+					SettleAccountsDate:  recordDateTime,
+					Ctime:               time.Now().Unix(),
+					Mtime:               time.Now().Unix(),
+					Status:              1,
+					Number:              record.Number,
+					Infcode:             0,
+					WarnMsg:             "",
+					Cainfo:              "",
+					ErrMsg:              "",
+					RespondTime:         "",
+					InfRefmsgid:         "",
+					OrderStatus:         1,
+					MdtrtId:             record.Number,
+					IsMedicineInsurance: 1,
+					SettleType:          settle_accounts_type,
+					SettleStartTime:     start_time,
+					SettleEndTime:       end_time,
+					Creator:             roles.AdminUserId,
+					Modify:              roles.AdminUserId,
+					PType:               1,
+					MedfeeSumamt:        totals,
 				}
-			}
-			allTotal := fmt.Sprintf("%.2f", total)
-			totals, _ := strconv.ParseFloat(allTotal, 64)
-
-			order := &models.HisOrder{
-				UserOrgId:           adminUser.CurrentOrgId,
-				HisPatientId:        record.ID,
-				PatientId:           record.PatientId,
-				SettleAccountsDate:  recordDateTime,
-				Ctime:               time.Now().Unix(),
-				Mtime:               time.Now().Unix(),
-				Status:              1,
-				Number:              chrg_bchno,
-				Infcode:             0,
-				WarnMsg:             "",
-				Cainfo:              "",
-				ErrMsg:              "",
-				RespondTime:         "",
-				InfRefmsgid:         "",
-				OrderStatus:         1,
-				MdtrtId:             record.Number,
-				IsMedicineInsurance: 1,
-				SettleType:          settle_accounts_type,
-				SettleStartTime:     start_time,
-				SettleEndTime:       end_time,
-				Creator:             roles.AdminUserId,
-				Modify:              roles.AdminUserId,
-				PType:               1,
-				MedfeeSumamt:        totals,
-			}
-			err = service.CreateOrder(order)
-			if err != nil {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreatePreOrderException)
-				return
-			}
-			for _, subItem := range ress {
-				for _, item := range subItem.Output.Result {
-					temp := strings.Split(item.FeedetlSn, "-")
-					var advice_id int64 = 0
-					var project_id int64 = 0
-					var types int64 = 0
-
-					id, _ := strconv.ParseInt(temp[2], 10, 64)
-					types, _ = strconv.ParseInt(temp[1], 10, 64)
-
-					if temp[1] == "1" {
-						advice_id = id
-						project_id = 0
-					} else if temp[1] == "2" {
-						advice_id = 0
-						project_id = id
-					}
-					info := &models.HisOrderInfo{
-						OrderNumber:      order.Number,
-						FeedetlSn:        item.FeedetlSn,
-						UploadDate:       time.Now().Unix(),
-						AdviceId:         advice_id,
-						DetItemFeeSumamt: item.DetItemFeeSumamt,
-						Cnt:              item.Cnt,
-						Pric:             float64(item.Pric),
-						PatientId:        record.PatientId,
-						PricUplmtAmt:     item.PricUplmtAmt,
-						SelfpayProp:      item.SelfpayProp,
-						FulamtOwnpayAmt:  item.FulamtOwnpayAmt,
-						OverlmtAmt:       item.OverlmtAmt,
-						PreselfpayAmt:    item.PreselfpayAmt,
-						BasMednFlag:      item.BasMednFlag,
-						MedChrgitmType:   item.MedChrgitmType,
-						HiNegoDrugFlag:   item.HiNegoDrugFlag,
-						Status:           1,
-						Memo:             item.Memo,
-						Mtime:            time.Now().Unix(),
-						InscpScpAmt:      item.InscpScpAmt,
-						DrtReimFlag:      item.DrtReimFlag,
-						Ctime:            time.Now().Unix(),
-						ListSpItemFlag:   item.ListSpItemFlag,
-						ChldMedcFlag:     item.ChldMedcFlag,
-						LmtUsedFlag:      item.LmtUsedFlag,
-						ChrgitmLv:        item.ChrgitmLv,
-						UserOrgId:        adminUser.CurrentOrgId,
-						HisPatientId:     record.ID,
-						OrderId:          order.ID,
-						ProjectId:        project_id,
-						Type:             types,
+				err = service.CreateOrder(order)
+				if err != nil {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreatePreOrderException)
+					return
+				}
+				for _, subItem := range ress {
+					for _, item := range subItem.Output.Result {
+						temp := strings.Split(item.FeedetlSn, "-")
+						var advice_id int64 = 0
+						var project_id int64 = 0
+						var types int64 = 0
+
+						id, _ := strconv.ParseInt(temp[2], 10, 64)
+						types, _ = strconv.ParseInt(temp[1], 10, 64)
+
+						if temp[1] == "1" {
+							advice_id = id
+							project_id = 0
+						} else if temp[1] == "2" {
+							advice_id = 0
+							project_id = id
+						}
+						info := &models.HisOrderInfo{
+							OrderNumber:      order.Number,
+							FeedetlSn:        item.FeedetlSn,
+							UploadDate:       time.Now().Unix(),
+							AdviceId:         advice_id,
+							DetItemFeeSumamt: item.DetItemFeeSumamt,
+							Cnt:              item.Cnt,
+							Pric:             float64(item.Pric),
+							PatientId:        record.PatientId,
+							PricUplmtAmt:     item.PricUplmtAmt,
+							SelfpayProp:      item.SelfpayProp,
+							FulamtOwnpayAmt:  item.FulamtOwnpayAmt,
+							OverlmtAmt:       item.OverlmtAmt,
+							PreselfpayAmt:    item.PreselfpayAmt,
+							BasMednFlag:      item.BasMednFlag,
+							MedChrgitmType:   item.MedChrgitmType,
+							HiNegoDrugFlag:   item.HiNegoDrugFlag,
+							Status:           1,
+							Memo:             item.Memo,
+							Mtime:            time.Now().Unix(),
+							InscpScpAmt:      item.InscpScpAmt,
+							DrtReimFlag:      item.DrtReimFlag,
+							Ctime:            time.Now().Unix(),
+							ListSpItemFlag:   item.ListSpItemFlag,
+							ChldMedcFlag:     item.ChldMedcFlag,
+							LmtUsedFlag:      item.LmtUsedFlag,
+							ChrgitmLv:        item.ChrgitmLv,
+							UserOrgId:        adminUser.CurrentOrgId,
+							HisPatientId:     record.ID,
+							OrderId:          order.ID,
+							ProjectId:        project_id,
+							Type:             types,
+							SettleType:       settle_accounts_type,
+						}
+						service.CreateOrderInfo(info)
 					}
-					service.CreateOrderInfo(info)
 				}
+				service.UpDatePrescriptionNumber(adminUser.CurrentOrgId, ids, record.Number)
+				service.UpDatePrescriptionInfoNumber(adminUser.CurrentOrgId, patientPrescription.PatientId, record.Number, recordDateTime)
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg": "上传费用明细成功",
+				})
+
 			}
-			service.UpDatePrescriptionNumber(adminUser.CurrentOrgId, ids, chrg_bchno)
-			service.UpDatePrescriptionInfoNumber(adminUser.CurrentOrgId, patientPrescription.PatientId, chrg_bchno, recordDateTime)
-			c.ServeSuccessJSON(map[string]interface{}{
-				"msg": "上传费用明细成功",
-			})
+
 		}
 
 	}
@@ -1233,34 +1304,111 @@ func (c *ZHHisApiController) ZHRefund() {
 
 }
 func (c *ZHHisApiController) ZHRefundDetail() {
+	patient_id, _ := c.GetInt64("patient_id")
+	his_patient_id, _ := c.GetInt64("his_patient_id")
+	record_time := c.GetString("record_time")
+	settle_accounts_type, _ := c.GetInt64("settle_accounts_type")
 	order_id, _ := c.GetInt64("order_id")
 	admin_user_id, _ := c.GetInt64("admin_user_id")
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_time+" 00:00:00", loc)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	recordDateTime := theTime.Unix()
 	adminUser := c.GetAdminUserInfo()
-	var order models.HisOrder
-	order, _ = service.GetHisOrderByID(order_id)
-	roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
+
+	//var prescriptions []*models.HisPrescription
 	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
-	config, _ := service.GetMedicalInsuranceConfig(adminUser.CurrentOrgId)
-	if config.IsOpen == 1 { //对接了医保，走医保流程
+	roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
 
-		result := service.Gdyb2302(order.PsnNo, order.MdtrtId, miConfig.OrgName, roles.UserName, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, miConfig.Code)
-		var dat map[string]interface{}
-		if err := json.Unmarshal([]byte(result), &dat); err == nil {
-			fmt.Println(dat)
-		} else {
-			fmt.Println(err)
+	if settle_accounts_type == 1 { //日结
+		infos, _ := service.GetZHHisUploadOrderInfo(adminUser.CurrentOrgId, patient_id, recordDateTime)
+		record, _ := service.GetInHospitalRecord(his_patient_id)
+		var isSuccess bool = true
+
+		for _, item := range infos {
+			result := service.Gdyb2302(record.PsnNo, record.Number, miConfig.OrgName, roles.UserName, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, miConfig.Code, item.FeedetlSn, 1)
+			var dat map[string]interface{}
+			if err := json.Unmarshal([]byte(result), &dat); err == nil {
+				fmt.Println(dat)
+			} else {
+				fmt.Println(err)
+			}
+			userJSONBytes, _ := json.Marshal(dat)
+			var res2 ResultEmpty
+			if err := json.Unmarshal(userJSONBytes, &res2); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			if res2.Infcode == -1 {
+				isSuccess = false
+			}
 		}
+		if isSuccess {
+			err := service.UpDateOrderInfoStatus(patient_id, recordDateTime, adminUser.CurrentOrgId)
 
-		userJSONBytes, _ := json.Marshal(dat)
+			if err != nil {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			err1 := service.UpDatePrescriptionOrderStatusTwo(patient_id, recordDateTime, adminUser.CurrentOrgId)
+			if err1 != nil {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg": "撤销明细成功",
+			})
 
-		var res2 ResultEmpty
-		if err := json.Unmarshal(userJSONBytes, &res2); err != nil {
-			utils.ErrorLog("解析失败：%v", err)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
 		}
-		if res2.Infcode == 0 {
-			err := service.UpdataOrderStatus(order_id, order.Number, adminUser.CurrentOrgId, "", result)
+
+	} else {
+		//prescriptions, _ = service.GetZHMonthHisUploadPrescription(adminUser.CurrentOrgId, patient_id, recordDateTime)
+		var order models.HisOrder
+		order, _ = service.GetHisOrderByID(order_id)
+		config, _ := service.GetMedicalInsuranceConfig(adminUser.CurrentOrgId)
+		if config.IsOpen == 1 { //对接了医保，走医保流程
+
+			result := service.Gdyb2302(order.PsnNo, order.MdtrtId, miConfig.OrgName, roles.UserName, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, miConfig.Code, "0000", 0)
+			var dat map[string]interface{}
+			if err := json.Unmarshal([]byte(result), &dat); err == nil {
+				fmt.Println(dat)
+			} else {
+				fmt.Println(err)
+			}
+
+			userJSONBytes, _ := json.Marshal(dat)
+
+			var res2 ResultEmpty
+			if err := json.Unmarshal(userJSONBytes, &res2); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			if res2.Infcode == 0 {
+				err := service.UpdataOrderStatus(order_id, order.Number, adminUser.CurrentOrgId, "", result)
+				if err == nil {
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg": "退费成功",
+					})
+				} else {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
+			} else {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"code": -10,
+					"msg":  res2.ErrMsg,
+				})
+			}
+		} else {
+			err := service.UpdataOrderStatus(order_id, order.Number, adminUser.CurrentOrgId, "", "")
 			if err == nil {
 				c.ServeSuccessJSON(map[string]interface{}{
 					"msg": "退费成功",
@@ -1269,22 +1417,8 @@ func (c *ZHHisApiController) ZHRefundDetail() {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 				return
 			}
-		} else {
-			c.ServeSuccessJSON(map[string]interface{}{
-				"code": -10,
-				"msg":  res2.ErrMsg,
-			})
-		}
-	} else {
-		err := service.UpdataOrderStatus(order_id, order.Number, adminUser.CurrentOrgId, "", "")
-		if err == nil {
-			c.ServeSuccessJSON(map[string]interface{}{
-				"msg": "退费成功",
-			})
-		} else {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
 		}
+
 	}
 
 }

models/his_models.go

@@ -743,6 +743,7 @@ type HisOrderInfo struct {
 	AllowReimburse         float64                `gorm:"column:allow_reimburse" json:"allow_reimburse" form:"allow_reimburse"`
 	HisDoctorAdviceInfo    HisDoctorAdviceInfo    `gorm:"ForeignKey:AdviceId;AssociationForeignKey:ID" json:"advice"`
 	HisPrescriptionProject HisPrescriptionProject `gorm:"ForeignKey:ID;AssociationForeignKey:ProjectId" json:"project"`
+	SettleType             int64                  `gorm:"column:settle_type" json:"settle_type" form:"settle_type"`
 }
 
 func (HisOrderInfo) TableName() string {

service/his_service.go

@@ -564,6 +564,11 @@ func UpDatePrescriptionNumber(user_org_id int64, ids []int64, number string) (er
 	return
 }
 
+func UpDatePrescriptionOrderStatus(user_org_id int64, ids []int64) (err error) {
+	err = writeDb.Model(&models.HisPrescription{}).Where("user_org_id = ? AND status = 1 AND id in (?)", user_org_id, ids).Updates(map[string]interface{}{"order_status": 4, "mtime": time.Now().Unix()}).Error
+	return
+}
+
 func UpDatePrescriptionInfoNumber(user_org_id int64, id int64, number string, record_time int64) (err error) {
 	err = writeDb.Model(&models.HisPrescriptionInfo{}).Where("user_org_id = ? AND status = 1 AND patient_id = ? AND record_date = ?", user_org_id, id, record_time).Updates(map[string]interface{}{"batch_number": number, "prescription_status": 2, "mtime": time.Now().Unix()}).Error
 

service/zh_his_service.go

@@ -644,7 +644,7 @@ func ZHGdyb2301(psnNo string, mdtrtId string, hisPrescription []*models.NewCusto
 }
 
 //  住院费用明细信息撤销
-func Gdyb2302(psnNo string, mdtrtId string, org_name string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, fixmedins_code string) string {
+func Gdyb2302(psnNo string, mdtrtId string, org_name string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, fixmedins_code string, number string, refund_type int64) string {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -655,10 +655,15 @@ func Gdyb2302(psnNo string, mdtrtId string, org_name string, doctor string, insu
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "2302" // 交易编码
+	if refund_type == 1 {
+		inputData["feedetl_sn"] = number //
 
-	inputData["mdtrt_id"] = mdtrtId  // 就诊 ID
-	inputData["feedetl_sn"] = "0000" //
-	inputData["psn_no"] = psnNo      // 人员编号
+	} else {
+		inputData["feedetl_sn"] = "0000" //
+	}
+
+	inputData["mdtrt_id"] = mdtrtId // 就诊 ID
+	inputData["psn_no"] = psnNo     // 人员编号
 
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
@@ -887,7 +892,7 @@ func GetZHHisPrescription(org_id int64, patient_id int64, record_date int64) (pr
 		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject", "status=1")
 		}).
-		Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND order_status <> 2 AND p_type = 1", org_id, record_date, patient_id).
+		Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND order_status <> 2 AND order_status <> 4 AND p_type = 1", org_id, record_date, patient_id).
 		Find(&prescription).Error
 	return
 }
@@ -903,7 +908,56 @@ func GetZHMonthHisPrescription(org_id int64, patient_id int64, start_time int64,
 		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject", "status=1")
 		}).
-		Where("user_org_id = ? AND record_date >= ? AND record_date <= ? AND patient_id = ? AND order_status <> 2 AND status = 1 AND p_type = 1 ", org_id, start_time, end_time, patient_id).
+		Where("user_org_id = ? AND record_date >= ? AND record_date <= ? AND patient_id = ? AND order_status <> 2 AND order_status <> 4 AND status = 1 AND p_type = 1 ", org_id, start_time, end_time, patient_id).
+		Find(&prescription).Error
+	return
+}
+
+func GetZHHisUploadPrescription(org_id int64, patient_id int64, record_date int64) (prescription []*models.HisPrescription, err error) {
+	err = readDb.Model(&models.HisPrescription{}).
+		Preload("HisAdditionalCharge", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("XtHisAddtionConfig", "status=1")
+		}).
+		Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("BaseDrugLib", "status=1")
+		}).
+		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject", "status=1")
+		}).
+		Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND order_status = 4 AND p_type = 1", org_id, record_date, patient_id).
+		Find(&prescription).Error
+	return
+}
+
+func GetZHMonthHisUploadPrescription(org_id int64, patient_id int64, start_time int64, end_time int64) (prescription []*models.HisPrescription, err error) {
+	err = readDb.Model(&models.HisPrescription{}).
+		Preload("HisAdditionalCharge", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("XtHisAddtionConfig", "status=1")
+		}).
+		Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("BaseDrugLib", "status=1")
+		}).
+		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject", "status=1")
+		}).
+		Where("user_org_id = ? AND record_date >= ? AND record_date <= ? AND patient_id = ? AND order_status == 4 AND status = 1 AND p_type = 1 ", org_id, start_time, end_time, patient_id).
 		Find(&prescription).Error
 	return
 }
+
+func GetZHHisUploadOrderInfo(org_id int64, patient_id int64, record_date int64) (infos []*models.HisOrderInfo, err error) {
+	err = readDb.Model(&models.HisOrderInfo{}).
+		Where("user_org_id = ? AND status = 1 AND upload_date <= ? AND upload_date >= ? AND patient_id = ? AND order_status = 4 AND p_type = 1", org_id, record_date, record_date, patient_id).
+		Find(&infos).Error
+	return
+}
+
+func UpDateOrderInfoStatus(patient_id int64, record_date int64, org_id int64) (err error) {
+	err = writeDb.Model(&models.HisOrderInfo{}).Where("user_org_id = ? AND status = 1 AND upload_date <= ? AND upload_date >= ? AND patient_id = ?", org_id, record_date, record_date, patient_id).Updates(map[string]interface{}{"status": 0}).Error
+	return
+}
+
+func UpDatePrescriptionOrderStatusTwo(patient_id int64, record_date int64, org_id int64) (err error) {
+	err = writeDb.Model(&models.HisPrescription{}).Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND p_type = 1", org_id, record_date, record_date, patient_id).Updates(map[string]interface{}{"order_status": 1}).Error
+	return
+}