提交代码

controllers/his_api_controller.go

@@ -6516,6 +6516,8 @@ func (c *HisApiController) GetHisOrderList() {
 	org_id := adminUser.CurrentOrgId
 	order, err, total := service.GetHisOrderList(org_id, page, limit, startTime, endTime, types, keywords, p_type, sort_type, start_time, end_time, charge_type, sch_type, zone_type, med_type)
 
+	order2, _ := service.GetNewHisOrderListTwo(org_id, startTime, endTime)
+
 	for _, item := range order {
 		info, _ := service.GetHisPrescriptionByPatientID(item.PatientId, item.UserOrgId)
 		item.DoctorName = info.Doctor
@@ -6524,8 +6526,9 @@ func (c *HisApiController) GetHisOrderList() {
 
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
-			"order": order,
-			"total": total,
+			"order":  order,
+			"order2": order2,
+			"total":  total,
 		})
 
 	} else {
@@ -10253,193 +10256,208 @@ func (c *HisApiController) CreateHisPrescriptionTemplate() {
 	//如果已经存在记录则删除处方
 	if template_one.ID > 0 {
 		ps, _ := service.GetHisPrescriptionInfoTemplates(template_one.ID, template_one.UserOrgId)
+		var ids []int64
+		var org_id int64
 		for _, item := range ps {
-			service.DelelteHisPrescriptionInfoTemplate(item.ID, item.UserOrgId)
+			org_id = c.GetAdminUserInfo().CurrentOrgId
+			ids = append(ids, item.ID)
 		}
-		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
-			prescriptions, _ := dataBody["prescriptions"].([]interface{})
-			if len(prescriptions) > 0 {
-				for _, item := range prescriptions {
-					items := item.(map[string]interface{})
-					if items["type"] == nil || reflect.TypeOf(items["type"]).String() != "float64" {
-						utils.ErrorLog("type")
-						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-						return
-					}
-					types := int64(items["type"].(float64))
+		err2 := service.BatchDelelteHisPrescriptionInfoTemplate(ids, org_id)
 
-					if items["med_type"] == nil || reflect.TypeOf(items["med_type"]).String() != "float64" {
-						utils.ErrorLog("med_type")
-						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-						return
-					}
-					med_type := strconv.Itoa(int(items["med_type"].(float64)))
+		if err2 == nil {
+			if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
+				prescriptions, _ := dataBody["prescriptions"].([]interface{})
+				if len(prescriptions) > 0 {
+					for _, item := range prescriptions {
+						items := item.(map[string]interface{})
+						if items["type"] == nil || reflect.TypeOf(items["type"]).String() != "float64" {
+							utils.ErrorLog("type")
+							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+							return
+						}
+						types := int64(items["type"].(float64))
 
-					ctime := time.Now().Unix()
-					prescription := &models.HisPrescriptionInfoTemplate{
-						PatientId:   patient_id,
-						UserOrgId:   adminInfo.CurrentOrgId,
-						Ctime:       ctime,
-						Mtime:       ctime,
-						Type:        types,
-						Modifier:    adminInfo.AdminUser.Id,
-						Creator:     adminInfo.AdminUser.Id,
-						Status:      1,
-						PTemplateId: template_one.ID,
-						MedType:     med_type,
-					}
-					service.CreateHisPrescriptionInfoTemplate(prescription)
+						if items["med_type"] == nil || reflect.TypeOf(items["med_type"]).String() != "float64" {
+							utils.ErrorLog("med_type")
+							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+							return
+						}
+						med_type := strconv.Itoa(int(items["med_type"].(float64)))
 
-					if items["advices"] != nil && reflect.TypeOf(items["advices"]).String() == "[]interface {}" {
-						advices := items["advices"].([]interface{})
-						//group := service.GetMaxAdviceGroupID(adminInfo.CurrentOrgId)
 						ctime := time.Now().Unix()
-						mtime := ctime
-						if len(advices) > 0 {
-							for _, advice := range advices {
-								var s models.HisPrescriptionAdviceTemplate
-								s.PrescriptionId = prescription.ID
-								s.AdviceType = 2
-								s.StopState = 2
-								s.ExecutionState = 2
-								s.Status = 1
-								s.UserOrgId = adminInfo.CurrentOrgId
-								s.CreatedTime = ctime
-								s.UpdatedTime = mtime
-								s.PatientId = patient_id
-								errcode := c.setAdviceTemplateWithJSON(&s, advice.(map[string]interface{}))
-								if errcode > 0 {
-									c.ServeFailJSONWithSGJErrorCode(errcode)
-									return
-								}
+						prescription := &models.HisPrescriptionInfoTemplate{
+							PatientId:   patient_id,
+							UserOrgId:   adminInfo.CurrentOrgId,
+							Ctime:       ctime,
+							Mtime:       ctime,
+							Type:        types,
+							Modifier:    adminInfo.AdminUser.Id,
+							Creator:     adminInfo.AdminUser.Id,
+							Status:      1,
+							PTemplateId: template_one.ID,
+							MedType:     med_type,
+						}
+						service.CreateHisPrescriptionInfoTemplate(prescription)
+
+						if items["advices"] != nil && reflect.TypeOf(items["advices"]).String() == "[]interface {}" {
+							advices := items["advices"].([]interface{})
+							//group := service.GetMaxAdviceGroupID(adminInfo.CurrentOrgId)
+							ctime := time.Now().Unix()
+							mtime := ctime
+							if len(advices) > 0 {
+								for _, advice := range advices {
+									var s models.HisPrescriptionAdviceTemplate
+									s.PrescriptionId = prescription.ID
+									s.AdviceType = 2
+									s.StopState = 2
+									s.ExecutionState = 2
+									s.Status = 1
+									s.UserOrgId = adminInfo.CurrentOrgId
+									s.CreatedTime = ctime
+									s.UpdatedTime = mtime
+									s.PatientId = patient_id
+									errcode := c.setAdviceTemplateWithJSON(&s, advice.(map[string]interface{}))
+									if errcode > 0 {
+										c.ServeFailJSONWithSGJErrorCode(errcode)
+										return
+									}
 
-								service.CreateHisPrescriptionAdviceTemplate(&s)
+									service.CreateHisPrescriptionAdviceTemplate(&s)
 
+								}
 							}
 						}
-					}
-					if items["project"] != nil && reflect.TypeOf(items["project"]).String() == "[]interface {}" {
-						projects := items["project"].([]interface{})
-						if len(projects) > 0 {
-							for _, project := range projects {
-								var p models.HisPrescriptionProjectTemplate
-								p.PrescriptionId = prescription.ID
-								p.Ctime = time.Now().Unix()
-								p.Mtime = time.Now().Unix()
-								p.PatientId = patient_id
-								p.UserOrgId = adminInfo.CurrentOrgId
-								p.Status = 1
-								errcode := c.setProjectTemplateWithJSON(&p, project.(map[string]interface{}))
-								if errcode > 0 {
-									c.ServeFailJSONWithSGJErrorCode(errcode)
-									return
-								}
-								service.CreateHisPrescriptionProjectTemplate(&p)
+						if items["project"] != nil && reflect.TypeOf(items["project"]).String() == "[]interface {}" {
+							projects := items["project"].([]interface{})
+							if len(projects) > 0 {
+								for _, project := range projects {
+									var p models.HisPrescriptionProjectTemplate
+									p.PrescriptionId = prescription.ID
+									p.Ctime = time.Now().Unix()
+									p.Mtime = time.Now().Unix()
+									p.PatientId = patient_id
+									p.UserOrgId = adminInfo.CurrentOrgId
+									p.Status = 1
+									errcode := c.setProjectTemplateWithJSON(&p, project.(map[string]interface{}))
+									if errcode > 0 {
+										c.ServeFailJSONWithSGJErrorCode(errcode)
+										return
+									}
+									service.CreateHisPrescriptionProjectTemplate(&p)
 
+								}
 							}
 						}
+
 					}
 
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg": "创建成功",
+					})
 				}
-
-				c.ServeSuccessJSON(map[string]interface{}{
-					"msg": "创建成功",
-				})
 			}
+		} else {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
 		}
 
 	} else {
-		err = service.CreateHisPrescriptionTemplate(template)
-		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
-			prescriptions, _ := dataBody["prescriptions"].([]interface{})
-			if len(prescriptions) > 0 {
-				for _, item := range prescriptions {
-					items := item.(map[string]interface{})
-					if items["type"] == nil || reflect.TypeOf(items["type"]).String() != "float64" {
-						utils.ErrorLog("type")
-						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-						return
-					}
-					types := int64(items["type"].(float64))
-
-					if items["med_type"] == nil || reflect.TypeOf(items["med_type"]).String() != "float64" {
-						utils.ErrorLog("med_type")
-						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-						return
-					}
-					med_type := strconv.Itoa(int(items["med_type"].(float64)))
+		err3 := service.CreateHisPrescriptionTemplate(template)
+		if err3 == nil {
+			if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
+				prescriptions, _ := dataBody["prescriptions"].([]interface{})
+				if len(prescriptions) > 0 {
+					for _, item := range prescriptions {
+						items := item.(map[string]interface{})
+						if items["type"] == nil || reflect.TypeOf(items["type"]).String() != "float64" {
+							utils.ErrorLog("type")
+							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+							return
+						}
+						types := int64(items["type"].(float64))
 
-					ctime := time.Now().Unix()
-					prescription := &models.HisPrescriptionInfoTemplate{
-						PatientId:   patient_id,
-						UserOrgId:   adminInfo.CurrentOrgId,
-						Ctime:       ctime,
-						Mtime:       ctime,
-						Type:        types,
-						Modifier:    adminInfo.AdminUser.Id,
-						Creator:     adminInfo.AdminUser.Id,
-						Status:      1,
-						PTemplateId: template.ID,
-						MedType:     med_type,
-					}
-					service.CreateHisPrescriptionInfoTemplate(prescription)
+						if items["med_type"] == nil || reflect.TypeOf(items["med_type"]).String() != "float64" {
+							utils.ErrorLog("med_type")
+							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+							return
+						}
+						med_type := strconv.Itoa(int(items["med_type"].(float64)))
 
-					if items["advices"] != nil && reflect.TypeOf(items["advices"]).String() == "[]interface {}" {
-						advices := items["advices"].([]interface{})
-						//group := service.GetMaxAdviceGroupID(adminInfo.CurrentOrgId)
 						ctime := time.Now().Unix()
-						mtime := ctime
-						if len(advices) > 0 {
-							for _, advice := range advices {
-								var s models.HisPrescriptionAdviceTemplate
-								s.PrescriptionId = prescription.ID
-								s.AdviceType = 2
-								s.StopState = 2
-								s.ExecutionState = 2
-								s.Status = 1
-								s.UserOrgId = adminInfo.CurrentOrgId
-								s.CreatedTime = ctime
-								s.UpdatedTime = mtime
-								s.PatientId = patient_id
-								errcode := c.setAdviceTemplateWithJSON(&s, advice.(map[string]interface{}))
-								if errcode > 0 {
-									c.ServeFailJSONWithSGJErrorCode(errcode)
-									return
-								}
+						prescription := &models.HisPrescriptionInfoTemplate{
+							PatientId:   patient_id,
+							UserOrgId:   adminInfo.CurrentOrgId,
+							Ctime:       ctime,
+							Mtime:       ctime,
+							Type:        types,
+							Modifier:    adminInfo.AdminUser.Id,
+							Creator:     adminInfo.AdminUser.Id,
+							Status:      1,
+							PTemplateId: template.ID,
+							MedType:     med_type,
+						}
+						service.CreateHisPrescriptionInfoTemplate(prescription)
+
+						if items["advices"] != nil && reflect.TypeOf(items["advices"]).String() == "[]interface {}" {
+							advices := items["advices"].([]interface{})
+							//group := service.GetMaxAdviceGroupID(adminInfo.CurrentOrgId)
+							ctime := time.Now().Unix()
+							mtime := ctime
+							if len(advices) > 0 {
+								for _, advice := range advices {
+									var s models.HisPrescriptionAdviceTemplate
+									s.PrescriptionId = prescription.ID
+									s.AdviceType = 2
+									s.StopState = 2
+									s.ExecutionState = 2
+									s.Status = 1
+									s.UserOrgId = adminInfo.CurrentOrgId
+									s.CreatedTime = ctime
+									s.UpdatedTime = mtime
+									s.PatientId = patient_id
+									errcode := c.setAdviceTemplateWithJSON(&s, advice.(map[string]interface{}))
+									if errcode > 0 {
+										c.ServeFailJSONWithSGJErrorCode(errcode)
+										return
+									}
 
-								service.CreateHisPrescriptionAdviceTemplate(&s)
+									service.CreateHisPrescriptionAdviceTemplate(&s)
 
+								}
 							}
 						}
-					}
-					if items["project"] != nil && reflect.TypeOf(items["project"]).String() == "[]interface {}" {
-						projects := items["project"].([]interface{})
-						if len(projects) > 0 {
-							for _, project := range projects {
-								var p models.HisPrescriptionProjectTemplate
-								p.PrescriptionId = prescription.ID
-								p.Ctime = time.Now().Unix()
-								p.Mtime = time.Now().Unix()
-								p.PatientId = patient_id
-								p.UserOrgId = adminInfo.CurrentOrgId
-								p.Status = 1
-								errcode := c.setProjectTemplateWithJSON(&p, project.(map[string]interface{}))
-								if errcode > 0 {
-									c.ServeFailJSONWithSGJErrorCode(errcode)
-									return
-								}
-								service.CreateHisPrescriptionProjectTemplate(&p)
+						if items["project"] != nil && reflect.TypeOf(items["project"]).String() == "[]interface {}" {
+							projects := items["project"].([]interface{})
+							if len(projects) > 0 {
+								for _, project := range projects {
+									var p models.HisPrescriptionProjectTemplate
+									p.PrescriptionId = prescription.ID
+									p.Ctime = time.Now().Unix()
+									p.Mtime = time.Now().Unix()
+									p.PatientId = patient_id
+									p.UserOrgId = adminInfo.CurrentOrgId
+									p.Status = 1
+									errcode := c.setProjectTemplateWithJSON(&p, project.(map[string]interface{}))
+									if errcode > 0 {
+										c.ServeFailJSONWithSGJErrorCode(errcode)
+										return
+									}
+									service.CreateHisPrescriptionProjectTemplate(&p)
 
+								}
 							}
 						}
+
 					}
 
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg": "创建成功",
+					})
 				}
-
-				c.ServeSuccessJSON(map[string]interface{}{
-					"msg": "创建成功",
-				})
 			}
+		} else {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
 		}
 	}
 

models/his_models.go

@@ -1098,6 +1098,106 @@ func (HisOrder) TableName() string {
 	return "his_order"
 }
 
+type HisOrderOther struct {
+	ID                  int64     `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId           int64     `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	HisPatientId        int64     `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	SettleAccountsDate  int64     `gorm:"column:settle_accounts_date" json:"settle_accounts_date" form:"settle_accounts_date"`
+	Ctime               int64     `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime               int64     `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status              int64     `gorm:"column:status" json:"status" form:"status"`
+	Number              string    `gorm:"column:number" json:"number" form:"number"`
+	PatientId           int64     `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Infcode             int64     `gorm:"column:infcode" json:"infcode" form:"infcode"`
+	WarnMsg             string    `gorm:"column:warn_msg" json:"warn_msg" form:"warn_msg"`
+	Cainfo              string    `gorm:"column:cainfo" json:"cainfo" form:"cainfo"`
+	ErrMsg              string    `gorm:"column:err_msg" json:"err_msg" form:"err_msg"`
+	RespondTime         string    `gorm:"column:respond_time" json:"respond_time" form:"respond_time"`
+	InfRefmsgid         string    `gorm:"column:inf_refmsgid" json:"inf_refmsgid" form:"inf_refmsgid"`
+	OrderStatus         int64     `gorm:"column:order_status" json:"order_status" form:"order_status"`
+	MdtrtId             string    `gorm:"column:mdtrt_id" json:"mdtrt_id" form:"mdtrt_id"`
+	SetlId              string    `gorm:"column:setl_id" json:"setl_id" form:"setl_id"`
+	PsnNo               string    `gorm:"column:psn_no" json:"psn_no" form:"psn_no"`
+	PsnName             string    `gorm:"column:psn_name" json:"psn_name" form:"psn_name"`
+	PsnCertType         string    `gorm:"column:psn_cert_type" json:"psn_cert_type" form:"psn_cert_type"`
+	Certno              string    `gorm:"column:certno" json:"certno" form:"certno"`
+	Gend                string    `gorm:"column:gend" json:"gend" form:"gend"`
+	Naty                string    `gorm:"column:naty" json:"naty" form:"naty"`
+	Brdy                time.Time `gorm:"column:brdy" json:"brdy" form:"brdy"`
+	Age                 float64   `gorm:"column:age" json:"age" form:"age"`
+	Insutype            string    `gorm:"column:insutype" json:"insutype" form:"insutype"`
+	PsnType             string    `gorm:"column:psn_type" json:"psn_type" form:"psn_type"`
+	CvlservFlag         string    `gorm:"column:cvlserv_flag" json:"cvlserv_flag" form:"cvlserv_flag"`
+	SetlTime            string    `gorm:"column:setl_time" json:"setl_time" form:"setl_time"`
+	MdtrtCertType       string    `gorm:"column:mdtrt_cert_type" json:"mdtrt_cert_type" form:"mdtrt_cert_type"`
+	MedType             string    `gorm:"column:med_type" json:"med_type" form:"med_type"`
+	MedfeeSumamt        float64   `gorm:"column:medfee_sumamt" json:"medfee_sumamt" form:"medfee_sumamt"`
+	FulamtOwnpayAmt     float64   `gorm:"column:fulamt_ownpay_amt" json:"fulamt_ownpay_amt" form:"fulamt_ownpay_amt"`
+	OverlmtSelfPay      float64   `gorm:"column:overlmt_self_pay" json:"overlmt_self_pay" form:"overlmt_self_pay"`
+	PreselfpayAmt       float64   `gorm:"column:preselfpay_amt" json:"preselfpay_amt" form:"preselfpay_amt"`
+	InscpScpAmt         float64   `gorm:"column:inscp_scp_amt" json:"inscp_scp_amt" form:"inscp_scp_amt"`
+	ActPayDedc          float64   `gorm:"column:act_pay_dedc" json:"act_pay_dedc" form:"act_pay_dedc"`
+	HifpPay             float64   `gorm:"column:hifp_pay" json:"hifp_pay" form:"hifp_pay"`
+	CvlservPay          float64   `gorm:"column:cvlserv_pay" json:"cvlserv_pay" form:"cvlserv_pay"`
+	PoolPropSelfpay     float64   `gorm:"column:pool_prop_selfpay" json:"pool_prop_selfpay" form:"pool_prop_selfpay"`
+	HifesPay            float64   `gorm:"column:hifes_pay" json:"hifes_pay" form:"hifes_pay"`
+	HifmiPay            float64   `gorm:"column:hifmi_pay" json:"hifmi_pay" form:"hifmi_pay"`
+	HifobPay            float64   `gorm:"column:hifob_pay" json:"hifob_pay" form:"hifob_pay"`
+	MafPay              float64   `gorm:"column:maf_pay" json:"maf_pay" form:"maf_pay"`
+	OthPay              float64   `gorm:"column:oth_pay" json:"oth_pay" form:"oth_pay"`
+	FundPaySumamt       float64   `gorm:"column:fund_pay_sumamt" json:"fund_pay_sumamt" form:"fund_pay_sumamt"`
+	PsnPartAmt          float64   `gorm:"column:psn_part_amt" json:"psn_part_amt" form:"psn_part_amt"`
+	AcctPay             float64   `gorm:"column:acct_pay" json:"acct_pay" form:"acct_pay"`
+	PsnCashPay          float64   `gorm:"column:psn_cash_pay" json:"psn_cash_pay" form:"psn_cash_pay"`
+	HospPartAmt         float64   `gorm:"column:hosp_part_amt" json:"hosp_part_amt" form:"hosp_part_amt"`
+	Balc                float64   `gorm:"column:balc" json:"balc" form:"balc"`
+	AcctMulaidPay       float64   `gorm:"column:acct_mulaid_pay" json:"acct_mulaid_pay" form:"acct_mulaid_pay"`
+	MedinsSetlId        string    `gorm:"column:medins_setl_id" json:"medins_setl_id" form:"medins_setl_id"`
+	ClrOptins           string    `gorm:"column:clr_optins" json:"clr_optins" form:"clr_optins"`
+	ClrWay              string    `gorm:"column:clr_way" json:"clr_way" form:"clr_way"`
+	ClrType             string    `gorm:"column:clr_type" json:"clr_type" form:"clr_type"`
+	SetlDetail          string    `gorm:"column:setl_detail" json:"setl_detail" form:"setl_detail"`
+	IsMedicineInsurance int64     `gorm:"column:is_medicine_insurance" json:"is_medicine_insurance" form:"is_medicine_insurance"`
+	PayWay              int64     `gorm:"column:pay_way" json:"pay_way" form:"pay_way"`
+
+	PayPrice              float64  `gorm:"column:pay_price" json:"pay_price" form:"pay_price"`
+	PayCardNo             string   `gorm:"column:pay_card_no" json:"pay_card_no" form:"pay_card_no"`
+	DiscountPrice         float64  `gorm:"column:discount_price" json:"discount_price" form:"discount_price"`
+	PreferentialPrice     float64  `gorm:"column:preferential_price" json:"preferential_price" form:"preferential_price"`
+	RealityPrice          float64  `gorm:"column:reality_price" json:"reality_price" form:"reality_price"`
+	FoundPrice            float64  `gorm:"column:found_price" json:"found_price" form:"found_price"`
+	MedicalInsurancePrice float64  `gorm:"column:medical_insurance_price" json:"medical_insurance_price" form:"medical_insurance_price"`
+	PrivatePrice          float64  `gorm:"column:private_price" json:"private_price" form:"private_price"`
+	DepartmentName        string   `gorm:"-" json:"department_name" form:"department_name"`
+	DoctorName            string   `gorm:"-" json:"doctor_name" form:"doctor_name"`
+	Creator               int64    `gorm:"column:creator" json:"creator" form:"creator"`
+	PType                 int64    `gorm:"column:p_type" json:"p_type" form:"p_type"`
+	Decimal               float64  `gorm:"column:decimal" json:"decimal" form:"decimal"`
+	OthDesc               string   `gorm:"oth_desc" json:"oth_desc" form:"oth_desc"`
+	PayWays               string   `gorm:"pay_ways" json:"pay_ways" form:"pay_ways"`
+	CashPay               string   `gorm:"cash_pay" json:"cash_pay" form:"cash_pay"`
+	BandCardPay           string   `gorm:"band_card_pay" json:"band_card_pay" form:"band_card_pay"`
+	WechatPay             string   `gorm:"wechat_pay" json:"wechat_pay" form:"wechat_pay"`
+	AliPay                string   `gorm:"ali_pay" json:"ali_pay" form:"ali_pay"`
+	JifenPay              string   `gorm:"jifen_pay" json:"jifen_pay" form:"jifen_pay"`
+	FaPiaoCode            string   `gorm:"column:fa_piao_code" json:"fa_piao_code" form:"fa_piao_code"`
+	FaPiaoNumber          string   `gorm:"column:fa_piao_number" json:"fa_piao_number" form:"fa_piao_number"`
+	SettleType            int64    `gorm:"column:settle_type" json:"settle_type" form:"settle_type"`
+	SettleStartTime       int64    `gorm:"column:settle_start_time" json:"settle_start_time" form:"settle_start_time"`
+	SettleEndTime         int64    `gorm:"column:settle_end_time" json:"settle_end_time" form:"settle_end_time"`
+	Patients              Patients `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
+	IsPre                 int64    `gorm:"column:is_pre" json:"is_pre" form:"is_pre"`
+	Diagnosis             string   `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	FaPiaoBatchnumberId   int64    `gorm:"column:fa_piao_batchnumber_id" json:"fa_piao_batchnumber_id" form:"fa_piao_batchnumber_id"`
+	IsUploadDiagnose      int64    `gorm:"column:is_upload_diagnose" json:"is_upload_diagnose" form:"is_upload_diagnose"`
+	IsUploadOrderInfo     int64    `gorm:"column:is_upload_order_info" json:"is_upload_order_info" form:"is_upload_order_info"`
+	IsUploadSuccess       int64    `gorm:"column:is_upload_success" json:"is_upload_success" form:"is_upload_success"`
+}
+
+func (HisOrderOther) TableName() string {
+	return "his_order"
+}
+
 type HisOrderInfo struct {
 	ID               int64   `gorm:"column:id" json:"id" form:"id"`
 	OrderNumber      string  `gorm:"column:order_number" json:"order_number" form:"order_number"`

service/his_charge_service.go

@@ -157,7 +157,7 @@ func GetNewAllPatientDrugChargeDetails(org_id int64, start_time_str string, end_
 		switch item_type {
 		case 0:
 			err = readDb.Table("his_order_info as oi").Select("oi.advice_id as advice_id, 0 as project_id, oi.patient_id as p_id,oi.cnt as cnt,oi.pric as pric,pp.name as p_name,drug.drug_name as item_name,drug.dose as dose,drug.dose_unit as dose_unit, drug.min_number as min_number,drug.min_unit as min_unit, drug.max_unit as max_unit,drug.id as item_id").
-				Joins("JOIN his_order o ON oi.order_number = o.number   and o.setl_time BETWEEN  ? AND ?  and o.order_status = 2 and o.status = 1 and o.is_medicine_insurance = 1", start_time_str, end_time_str).
+				Joins("JOIN his_order o ON oi.order_number = o.number   and o.setl_time BETWEEN  ? AND ?  and o.order_status = 2 and o.status = 1", start_time_str, end_time_str).
 				Joins(" JOIN his_doctor_advice_info a ON oi.advice_id = a.id").
 				Joins(" JOIN xt_patients pp on oi.patient_id = pp.id").
 				Joins(" JOIN  xt_base_drug drug on  a.drug_id = drug.id").
@@ -165,7 +165,7 @@ func GetNewAllPatientDrugChargeDetails(org_id int64, start_time_str string, end_
 			break
 		case 1:
 			err = readDb.Table("his_order_info as oi").Select("oi.advice_id as advice_id, 0 as project_id, oi.patient_id as p_id,oi.cnt as cnt,oi.pric as pric,pp.name as p_name,drug.drug_name as item_name,drug.dose as dose,drug.dose_unit as dose_unit, drug.min_number as min_number,drug.min_unit as min_unit, drug.max_unit as max_unit,drug.id as item_id").
-				Joins("JOIN his_order o ON oi.order_number = o.number   and o.setl_time BETWEEN  ? AND ?  and o.order_status = 2 and o.status = 1 and o.is_medicine_insurance = 1", start_time_str, end_time_str).
+				Joins("JOIN his_order o ON oi.order_number = o.number   and o.setl_time BETWEEN  ? AND ?  and o.order_status = 2 and o.status = 1", start_time_str, end_time_str).
 				Joins(" JOIN his_doctor_advice_info a ON oi.advice_id = a.id").
 				Joins(" JOIN xt_patients pp on oi.patient_id = pp.id").
 				Joins(" JOIN  xt_base_drug drug on  a.drug_id = drug.id").
@@ -243,7 +243,7 @@ func GetNewAllPatientProjectAndGoodChargeDetails(org_id int64, start_time_str st
 			break
 		case 3:
 			err = readDb.Table("his_order_info as oi").Select("0 as advice_id, oi.project_id as project_id, oi.patient_id as p_id,oi.cnt as cnt,oi.pric as pric,pp.name as p_name,p.type as p_type,  (case p.type  when 2 then project.project_name  when 3 then good.good_name  END) as item_name,(case p.type  when 2 then ''  when 3 then good.specification_name  END) as specification_name, p.project_id as item_id").
-				Joins("JOIN his_order o ON oi.order_number = o.number   and o.setl_time BETWEEN  ? AND ?  and o.order_status = 2 and o.status = 1 and o.is_medicine_insurance <> 1", start_time_str, end_time_str).
+				Joins("JOIN his_order o ON oi.order_number = o.number   and o.setl_time BETWEEN  ? AND ?  and o.order_status = 2 and o.status = 1 ", start_time_str, end_time_str).
 				Joins(" JOIN his_prescription_project p ON oi.project_id = p.id and p.type = 3").
 				Joins("left join xt_his_project project on  p.project_id = project.id").
 				Joins("left join  xt_good_information good on  p.project_id = good.id").

service/his_config_service.go

@@ -52,6 +52,14 @@ func DelelteHisPrescriptionInfoTemplate(id int64, user_org_id int64) (err error)
 	return
 }
 
+func BatchDelelteHisPrescriptionInfoTemplate(id []int64, user_org_id int64) (err error) {
+
+	err = writeDb.Model(&models.HisPrescriptionInfoTemplate{}).Where("user_org_id = ? AND id in (?)", user_org_id, id).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
+	err = writeDb.Model(&models.HisPrescriptionAdviceTemplate{}).Where("user_org_id = ? AND prescription_id in (?)", user_org_id, id).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
+	err = writeDb.Model(&models.HisPrescriptionProjectTemplate{}).Where("user_org_id = ? AND prescription_id in (?)", user_org_id, id).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
+	return
+}
+
 func DelelteHisPrescriptionTemplate(id int64, user_org_id int64) (err error) {
 	err = writeDb.Model(&models.HisPrescriptionTemplate{}).Where("user_org_id = ? AND id = ?", user_org_id, id).Updates(map[string]interface{}{"status": 0}).Error
 	err = writeDb.Model(&models.HisPrescriptionInfoTemplate{}).Where("user_org_id = ? AND p_template_id = ?", user_org_id, id).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error

service/his_service.go

@@ -1073,6 +1073,19 @@ func GetHisOrderList(user_org_id int64, page int64, limit int64, start_time_time
 	return
 }
 
+func GetNewHisOrderListTwo(user_org_id int64, start_time_timestamp int64, end_time_timestamp int64) (order []*models.HisOrder, err error) {
+	db := readDb.Model(&models.HisOrder{})
+	if start_time_timestamp != 0 {
+		db = db.Where("his_order.settle_accounts_date>=?", start_time_timestamp)
+	}
+	if end_time_timestamp != 0 {
+		db = db.Where("his_order.settle_accounts_date<=?", end_time_timestamp)
+	}
+	db = db.Where("user_org_id = ?", user_org_id)
+	err = db.Preload("Patients", "status = 1 AND user_org_id = ?", user_org_id).Find(&order).Error
+	return
+}
+
 func UpDatePrescriptionNumber(user_org_id int64, ids []int64, number string) (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{}{"batch_number": number, "mtime": time.Now().Unix()}).Error
 	return