医保对接

.idea/misc.xml

@@ -3,6 +3,9 @@
   <component name="JavaScriptSettings">
     <option name="languageLevel" value="ES6" />
   </component>
+  <component name="RustProjectSettings">
+    <option name="toolchainHomeDirectory" value="$USER_HOME$/.cargo/bin" />
+  </component>
   <component name="SvnBranchConfigurationManager">
     <option name="myConfigurationMap">
       <map>

conf/app.conf

@@ -5,7 +5,7 @@ runmode = prod
 #
 copyrequestbody = true
 sessionon = true
-sessiongcmaxlifetime = 64800
+#sessiongcmaxlifetime = 64800
 
 tokencookiemaxlifetime = 7200
 enablexsrf = false

controllers/his_api_controller.go

@@ -78,6 +78,8 @@ func HisManagerApiRegistRouters() {
 	beego.Router("/api/orderdetail/get", &HisApiController{}, "get:GetAllOrderDetail")
 	beego.Router("/api/orderdetaicollect/get", &HisApiController{}, "get:GetAllOrderDetailCollect")
 
+	beego.Router("/api/cost/compare", &HisApiController{}, "get:GetMedicalInsuranceCostCompareList")
+
 }
 
 func (c *HisApiController) Sscard() {
@@ -2731,3 +2733,23 @@ func (c *HisApiController) GetAllOrderDetailCollect() {
 	})
 	return
 }
+
+func (c *HisApiController) GetMedicalInsuranceCostCompareList() {
+	page, _ := c.GetInt64("page")
+	limit, _ := c.GetInt64("limit")
+	keywords := c.GetString("keywords")
+
+	if page <= 0 {
+		page = 1
+	}
+	if limit <= 0 {
+		limit = 10
+	}
+	list, total, _ := service.GetMedicalInsuranceCostCompareList(c.GetAdminUserInfo().CurrentOrgId, page, limit, keywords)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"total": total,
+		"list":  list,
+	})
+	return
+
+}

controllers/new_mobile_api_controllers/new_role_api_controller.go

@@ -436,7 +436,8 @@ func (this *NewRoleApiController) AddRoleStaff() {
 }
 
 func (this *NewRoleApiController) GetFuntionPurviews() {
-	functionPurview, _ := service.GetFunctionPurview()
+	pid, _ := this.GetInt64("pid")
+	functionPurview, _ := service.GetFunctionPurview(pid)
 	this.ServeSuccessJSON(map[string]interface{}{
 		"funtion_purview": functionPurview,
 	})

controllers/role_controller.go

@@ -558,7 +558,7 @@ func (this *RoleAPIController) EditPurviewInitData() {
 		if item.Name == "耗材管理" {
 			item.Childs = append(item.Childs, subConsumablesPurviewTreeViewModel...)
 		}
-		if item.Name == "药品管理" {
+		if item.Name == "药库管理" {
 			item.Childs = append(item.Childs, subDrugPurviewTreeViewModel...)
 		}
 		if item.Name == "自备药管理" {

service/his_service.go

@@ -988,7 +988,9 @@ func GetHisPrescriptionByType(change_type int64, record_time int64, org_id int64
 		err = readDb.Model(&VMOtherHisPrescriptionInfo{}).Where("patient_id = ? AND user_org_id = ? AND  status=1 AND record_date  = ?", patient_id, org_id, Id.RecordDate).
 			Preload("VMHisPrescription", func(db *gorm.DB) *gorm.DB {
 				return db.Where("status = 1 AND user_org_id = ?", org_id).
-					Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ?", org_id).
+					Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+						return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("Drug", "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")
 					})
@@ -1000,7 +1002,9 @@ func GetHisPrescriptionByType(change_type int64, record_time int64, org_id int64
 		err = readDb.Model(&VMOtherHisPrescriptionInfo{}).Where("patient_id = ? AND user_org_id = ? AND  status=1 AND record_date  = ?", patient_id, org_id, Id.RecordDate).
 			Preload("VMHisPrescription", func(db *gorm.DB) *gorm.DB {
 				return db.Where("status = 1 AND user_org_id = ?", org_id).
-					Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ?", org_id).
+					Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+						return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("Drug", "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")
 					})
@@ -1013,7 +1017,9 @@ func GetCallHisPrescriptions(start_time int64, end_time int64, org_id int64, pat
 	err = readDb.Model(&VMOtherHisPrescriptionInfo{}).Where("patient_id = ? AND user_org_id = ? AND  status=1 AND record_date >= ? AND record_date <= ?", patient_id, org_id, start_time, end_time).
 		Preload("VMHisPrescription", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1 AND user_org_id = ?", org_id).
-				Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ?", org_id).
+				Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+					return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("Drug", "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")
 				})
@@ -1253,3 +1259,38 @@ func GetHisOrderDetailByNumber(order_number string, org_id int64) (order []*HisO
 	}).Find(&order).Error
 	return
 }
+
+type MedicalInsuranceCostCompare struct {
+	ID        int64   `gorm:"column:id" json:"id" form:"id"`
+	StartTime int64   `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	EndTime   int64   `gorm:"column:end_time" json:"end_time" form:"end_time"`
+	Insutype  string  `gorm:"column:insutype" json:"insutype" form:"insutype"`
+	CheckType int64   `gorm:"column:check_type" json:"check_type" form:"check_type"`
+	Num       int64   `gorm:"column:num" json:"num" form:"num"`
+	Mtime     int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status    int64   `gorm:"column:status" json:"status" form:"status"`
+	UserOrgId int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	CostTotal float64 `gorm:"column:cost_total" json:"cost_total" form:"cost_total"`
+	FuncTotal float64 `gorm:"column:func_total" json:"func_total" form:"func_total"`
+	PsnPay    float64 `gorm:"column:psn_pay" json:"psn_pay" form:"psn_pay"`
+	Creator   int64   `gorm:"column:creator" json:"creator" form:"creator"`
+	Ctime     int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+}
+
+func (MedicalInsuranceCostCompare) TableName() string {
+	return "medical_insurance_cost_compare"
+}
+
+func GetMedicalInsuranceCostCompareList(orgID, page, limit int64, keywords string) (list []*MedicalInsuranceCostCompare, total int, err error) {
+	offset := (page - 1) * limit
+	db := readDb.Model(&MedicalInsuranceCostCompare{}).Where("user_org_id = ?", orgID)
+
+	if len(keywords) == 0 {
+		db = db.Where("status=1")
+		err = db.Count(&total).Offset(offset).Limit(limit).Find(&list).Error
+	} else {
+		db = db.Where("status=1")
+		err = db.Count(&total).Offset(offset).Limit(limit).Find(&list).Error
+	}
+	return
+}

service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go

@@ -1,5 +1,7 @@
 package schedule_dialysis
 
+import "XT_New/models"
+
 type PatientVM 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"`
@@ -519,20 +521,21 @@ type ScheduleVM struct {
 	BedID        int64 `gorm:"column:bed_id" json:"bed_id"`
 	PartitionId  int64 `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
 
-	Patient                  *PatientVM                  `gorm:"ForeignKey:PatientID" json:"patient"`
-	DialysisOrder            DialysisOrderVM             `gorm:"ForeignKey:DialysisDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"dialysis_order"`
-	Prescription             PrescriptionVM              `gorm:"ForeignKey:RecordDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"prescription"`
-	ReceiveAssessment        ReceiveAssessmentVM         `gorm:"ForeignKey:RecordDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"receive_assessment"`
-	XtReceiveTreatmentAsses  *XtReceiveTreatmentAsses    `gorm:"ForeignKey:RecordDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"xt_receive_assessment"`
-	AssessmentBeforeDislysis AssessmentBeforeDislysisVM  `gorm:"ForeignKey:AssessmentDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"assessment_before_dislysis"`
-	AssessmentAfterDislysis  AssessmentAfterDislysisVM   `gorm:"ForeignKey:AssessmentDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"assessment_after_dislysis"`
-	MonitoringRecords        []*MonitoringRecordVM       `gorm:"ForeignKey:MonitoringDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"monitor_records"`
-	DeviceNumber             *DeviceNumberVM             `gorm:"ForeignKey:BedID" json:"device_number"`
-	DeviceZone               *DeviceZoneVM               `gorm:"ForeignKey:PartitionId" json:"device_zone"`
-	Advices                  []*DoctorAdviceVM           `gorm:"ForeignKey:RecordDate,PatientID;AssociationForeignKey:ScheduleDate,PatientId" json:"advices"`
-	DoubleCheck              *DoubleCheckVM              `gorm:"ForeignKey:CheckDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"check"`
-	Summer                   *SummerVM                   `gorm:"ForeignKey:AssessmentDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"summer"`
-	LastAfterWeight          XtAssessmentAfterDislysisVM `gorm:"ForeignKey:PatientID;AssociationForeignKey:PatientID" json:"lastafterweight"`
+	Patient                  *PatientVM                    `gorm:"ForeignKey:PatientID" json:"patient"`
+	DialysisOrder            DialysisOrderVM               `gorm:"ForeignKey:DialysisDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"dialysis_order"`
+	Prescription             PrescriptionVM                `gorm:"ForeignKey:RecordDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"prescription"`
+	ReceiveAssessment        ReceiveAssessmentVM           `gorm:"ForeignKey:RecordDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"receive_assessment"`
+	XtReceiveTreatmentAsses  *XtReceiveTreatmentAsses      `gorm:"ForeignKey:RecordDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"xt_receive_assessment"`
+	AssessmentBeforeDislysis AssessmentBeforeDislysisVM    `gorm:"ForeignKey:AssessmentDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"assessment_before_dislysis"`
+	AssessmentAfterDislysis  AssessmentAfterDislysisVM     `gorm:"ForeignKey:AssessmentDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"assessment_after_dislysis"`
+	MonitoringRecords        []*MonitoringRecordVM         `gorm:"ForeignKey:MonitoringDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"monitor_records"`
+	DeviceNumber             *DeviceNumberVM               `gorm:"ForeignKey:BedID" json:"device_number"`
+	DeviceZone               *DeviceZoneVM                 `gorm:"ForeignKey:PartitionId" json:"device_zone"`
+	Advices                  []*DoctorAdviceVM             `gorm:"ForeignKey:RecordDate,PatientID;AssociationForeignKey:ScheduleDate,PatientId" json:"advices"`
+	DoubleCheck              *DoubleCheckVM                `gorm:"ForeignKey:CheckDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"check"`
+	Summer                   *SummerVM                     `gorm:"ForeignKey:AssessmentDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"summer"`
+	LastAfterWeight          XtAssessmentAfterDislysisVM   `gorm:"ForeignKey:PatientID;AssociationForeignKey:PatientID" json:"lastafterweight"`
+	HisAdvices               []*models.HisDoctorAdviceInfo `gorm:"ForeignKey:RecordDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"his_advices"`
 }
 
 func (ScheduleVM) TableName() string {

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

@@ -42,6 +42,11 @@ func GetSchedules(orgID int64, schIDs []string) ([]*ScheduleVM, error) {
 				Where("user_org_id = ? AND advice_type = 2 AND status = 1", orgID).
 				Order("start_time asc, groupno desc, advice_order desc, id asc")
 		}).
+		Preload("HisAdvices", func(db *gorm.DB) *gorm.DB {
+			return db.Select("id, user_org_id, patient_id, advice_type, advice_date, record_date, start_time, drug_spec_unit,advice_name,advice_desc, reminder_date, drug_spec, drug_spec_unit, single_dose, single_dose_unit, prescribing_number, prescribing_number_unit, delivery_way, execution_frequency, advice_doctor, status, created_time,updated_time, advice_affirm, remark, stop_time, stop_reason, stop_doctor, stop_state, parent_id, execution_time, execution_staff, execution_state, checker, check_state, check_time, groupno, IF(parent_id > 0, parent_id, id) as advice_order").
+				Where("user_org_id = ? AND status = 1", orgID).
+				Order("start_time asc, groupno desc, advice_order desc, id asc")
+		}).
 		Where("user_org_id = ? AND status = 1 AND id in (?)", orgID, schIDs).Order("schedule_date desc").
 		Find(&schedules).
 		Error