Merge branch '20211122' of http://git.shengws.com/csx/XT_New into 20211122

controllers/his_api_controller.go

@@ -90,7 +90,6 @@ func HisManagerApiRegistRouters() {
 	beego.Router("/api/orders", &HisApiController{}, "get:GetAllOrder")
 
 	beego.Router("/api/psn/ncds/delete", &HisApiController{}, "post:DeleteNCDS")
-
 	beego.Router("/api/bailin/export", &PublicApiController{}, "get:GetBaiLinExportData")
 	beego.Router("/api/his/gethistdoctoradviceinfo", &HisApiController{}, "get:GetHisDoctorAdviceInfo")
 
@@ -3735,7 +3734,7 @@ func (c *HisApiController) GetHisOrderList() {
 
 	adminUser := c.GetAdminUserInfo()
 	org_id := adminUser.CurrentOrgId
-	order, err, total := service.GetHisOrderList(org_id, page, limit, startTime, endTime, types, keywords, p_type, sort_type)
+	order, err, total := service.GetHisOrderList(org_id, page, limit, startTime, endTime, types, keywords, p_type, sort_type, start_time, end_time)
 
 	for _, item := range order {
 		info, _ := service.GetHisPrescriptionByPatientID(item.PatientId, item.UserOrgId)
@@ -5107,6 +5106,8 @@ func (c *HisApiController) GetCompareData() {
 	start_time := c.GetString("start_time")
 	end_time := c.GetString("end_time")
 	insutype := c.GetString("insutype")
+	clr_type := c.GetString("clr_type")
+
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	var theStartTIme int64
@@ -5125,7 +5126,7 @@ func (c *HisApiController) GetCompareData() {
 		}
 		theEndtTIme = theTime.Unix()
 	}
-	formData, err := service.GetCheckAccountFormData(theStartTIme, theEndtTIme, c.GetAdminUserInfo().CurrentOrgId, insutype)
+	formData, err := service.GetCheckAccountFormData(theStartTIme, theEndtTIme, c.GetAdminUserInfo().CurrentOrgId, insutype, clr_type)
 	fmt.Println(err)
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
@@ -5153,6 +5154,8 @@ func (c *HisApiController) GetFaPiaoData() {
 
 	his, _ := service.GetHisPatientInfoThree(adminUser.CurrentOrgId, number)
 
+	his_hospital_record, _ := service.GetInHospitalRecordByNumber(order.MdtrtId)
+
 	//prescriptions, _ := service.GetHisPrescriptionThree(adminUser.CurrentOrgId, patient_id, order.Number)
 
 	var bedCostTotal float64 = 0         //床位总费
@@ -5399,6 +5402,7 @@ func (c *HisApiController) GetFaPiaoData() {
 		"treatCostTotal":              treatCostTotal,
 		"treatCostSelfTotal":          treatCostSelfTotal,
 		"treatCostPartSelfTotal":      treatCostPartSelfTotal,
+		"his_hospital_record":         his_hospital_record,
 	})
 
 }

controllers/his_config_api_controller.go

@@ -25,6 +25,7 @@ func HisConfigApiRegistRouters() {
 	beego.Router("/api/his/prescriptioninfotemplate/delete", &HisConfigApiController{}, "post:DeletePrescriptionInfoTemplate")
 	beego.Router("/api/his/advicetemplate/delete", &HisConfigApiController{}, "post:DeleteAdviceTemplate")
 	beego.Router("/api/his/projecttemplate/delete", &HisConfigApiController{}, "post:DeleteProjectTemplate")
+	//beego.Router("/api/his/responsibilitydoctor/get", &HisConfigApiController{}, "get:GetResponsibilityDoctor")
 
 }
 

controllers/his_hospital_api_controller.go

@@ -91,180 +91,181 @@ func (c *HisHospitalApiController) GetUploadInfo() {
 	for _, item := range prescriptions {
 		ids = append(ids, item.ID)
 	}
-	config, _ := service.GetMedicalInsuranceConfig(adminUser.CurrentOrgId)
-	if config.IsOpen == 1 { //对接了医保，走医保流程
-
-		var customs []*models.NewCustom
-
-		for _, item := range prescriptions {
-			tm := time.Unix(item.PreTime, 0)
-			if item.Type == 1 { //药品
-				for _, subItem := range item.HisDoctorAdviceInfo {
-					if len(subItem.Drug.MedicalInsuranceNumber) > 0 && subItem.Drug.IsUser != 1 {
-						//var randNum int
-						//randNum = rand.Intn(10000) + 1000
+	//config, _ := service.GetMedicalInsuranceConfig(adminUser.CurrentOrgId)
+
+	var customs []*models.NewCustom
+
+	for _, item := range prescriptions {
+		tm := time.Unix(item.PreTime, 0)
+		if item.Type == 1 { //药品
+			for _, subItem := range item.HisDoctorAdviceInfo {
+				if len(subItem.Drug.MedicalInsuranceNumber) > 0 && subItem.Drug.IsUser != 1 {
+					//var randNum int
+					//randNum = rand.Intn(10000) + 1000
+					cus := &models.NewCustom{
+						DetItemFeeSumamt: subItem.Price * subItem.PrescribingNumber,
+						Cut:              subItem.PrescribingNumber,
+						FeedetlSn:        subItem.FeedetlSn,
+						Price:            subItem.Price,
+						MedListCodg:      subItem.Drug.MedicalInsuranceNumber,
+						HospApprFlag:     subItem.Drug.HospApprFlag,
+						FeeOcurTime:      tm.Format("2006-01-02 15:04:05"),
+					}
+
+					customs = append(customs, cus)
+				}
+			}
+		}
+
+		if item.Type == 2 { //项目
+			for _, subItem := range item.HisPrescriptionProject {
+				if subItem.Type == 2 {
+					if len(subItem.HisProject.MedicalCode) > 0 {
+						cnt, _ := strconv.ParseFloat(subItem.Count, 64)
 						cus := &models.NewCustom{
-							DetItemFeeSumamt: subItem.Price * subItem.PrescribingNumber,
-							Cut:              subItem.PrescribingNumber,
+							DetItemFeeSumamt: subItem.Price * cnt,
+							Cut:              cnt,
 							FeedetlSn:        subItem.FeedetlSn,
-							Price:            subItem.Price,
-							MedListCodg:      subItem.Drug.MedicalInsuranceNumber,
-							HospApprFlag:     subItem.Drug.HospApprFlag,
+							Price:            float64(subItem.Price),
+							MedListCodg:      subItem.HisProject.MedicalCode,
+							HospApprFlag:     -1,
 							FeeOcurTime:      tm.Format("2006-01-02 15:04:05"),
 						}
-
 						customs = append(customs, cus)
 					}
-				}
-			}
+				} else if subItem.Type == 3 {
+					if len(subItem.GoodInfo.MedicalInsuranceNumber) > 0 && subItem.GoodInfo.IsUser != 1 {
+						cnt, _ := strconv.ParseFloat(subItem.Count, 64)
 
-			if item.Type == 2 { //项目
-				for _, subItem := range item.HisPrescriptionProject {
-					if subItem.Type == 2 {
-						if len(subItem.HisProject.MedicalCode) > 0 {
-							cnt, _ := strconv.ParseFloat(subItem.Count, 64)
-							cus := &models.NewCustom{
-								DetItemFeeSumamt: subItem.Price * cnt,
-								Cut:              cnt,
-								FeedetlSn:        subItem.FeedetlSn,
-								Price:            float64(subItem.Price),
-								MedListCodg:      subItem.HisProject.MedicalCode,
-								HospApprFlag:     -1,
-								FeeOcurTime:      tm.Format("2006-01-02 15:04:05"),
-							}
-							customs = append(customs, cus)
-						}
-					} else if subItem.Type == 3 {
-						if len(subItem.GoodInfo.MedicalInsuranceNumber) > 0 && subItem.GoodInfo.IsUser != 1 {
-							cnt, _ := strconv.ParseFloat(subItem.Count, 64)
-
-							cus := &models.NewCustom{
-								DetItemFeeSumamt: subItem.Price * cnt,
-								Cut:              cnt,
-								FeedetlSn:        subItem.FeedetlSn,
-								Price:            float64(subItem.Price),
-								MedListCodg:      subItem.GoodInfo.MedicalInsuranceNumber,
-								HospApprFlag:     -1,
-								FeeOcurTime:      tm.Format("2006-01-02 15:04:05"),
-							}
-							customs = append(customs, cus)
+						cus := &models.NewCustom{
+							DetItemFeeSumamt: subItem.Price * cnt,
+							Cut:              cnt,
+							FeedetlSn:        subItem.FeedetlSn,
+							Price:            float64(subItem.Price),
+							MedListCodg:      subItem.GoodInfo.MedicalInsuranceNumber,
+							HospApprFlag:     -1,
+							FeeOcurTime:      tm.Format("2006-01-02 15:04:05"),
 						}
+						customs = append(customs, cus)
 					}
 				}
 			}
-
 		}
 
-		if settle_accounts_type == 1 {
-			for _, subItem := range customs {
-				temp := strings.Split(subItem.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:        subItem.FeedetlSn,
-					UploadDate:       recordDateTime,
-					AdviceId:         advice_id,
-					DetItemFeeSumamt: subItem.DetItemFeeSumamt,
-					Cnt:              subItem.Cut,
-					Pric:             float64(subItem.Price),
-					PatientId:        record.PatientId,
-					PricUplmtAmt:     0,
-					SelfpayProp:      0,
-					FulamtOwnpayAmt:  0,
-					OverlmtAmt:       0,
-					PreselfpayAmt:    0,
-					Status:           1,
-					Mtime:            time.Now().Unix(),
-					Ctime:            time.Now().Unix(),
-					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)
-			service.UpDatePrescriptionNumber(adminUser.CurrentOrgId, ids, record.Number)
-			service.UpDatePrescriptionInfoNumber(adminUser.CurrentOrgId, record.PatientId, record.Number, recordDateTime)
-			if err == nil {
-				c.ServeSuccessJSON(map[string]interface{}{
-					"msg": "上传费用明细成功",
-				})
-				return
-			} else {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
-				return
-			}
+	fmt.Println(settle_accounts_type)
 
-		} else {
+	if settle_accounts_type == 1 {
+		fmt.Println(customs)
+		for _, subItem := range customs {
+			temp := strings.Split(subItem.FeedetlSn, "-")
+			var advice_id int64 = 0
+			var project_id int64 = 0
+			var types int64 = 0
 
-			for _, subItem := range customs {
-				temp := strings.Split(subItem.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:        subItem.FeedetlSn,
-					UploadDate:       recordDateTime,
-					AdviceId:         advice_id,
-					DetItemFeeSumamt: subItem.DetItemFeeSumamt,
-					Cnt:              subItem.Cut,
-					Pric:             float64(subItem.Price),
-					PatientId:        record.PatientId,
-					PricUplmtAmt:     0,
-					SelfpayProp:      0,
-					FulamtOwnpayAmt:  0,
-					OverlmtAmt:       0,
-					PreselfpayAmt:    0,
-					Status:           1,
-					Mtime:            time.Now().Unix(),
-					Ctime:            time.Now().Unix(),
-					UserOrgId:        adminUser.CurrentOrgId,
-					HisPatientId:     record.ID,
-					OrderId:          0,
-					ProjectId:        project_id,
-					Type:             types,
-					SettleType:       settle_accounts_type,
-				}
-				service.CreateOrderInfo(info)
+			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:        subItem.FeedetlSn,
+				UploadDate:       recordDateTime,
+				AdviceId:         advice_id,
+				DetItemFeeSumamt: subItem.DetItemFeeSumamt,
+				Cnt:              subItem.Cut,
+				Pric:             float64(subItem.Price),
+				PatientId:        record.PatientId,
+				PricUplmtAmt:     0,
+				SelfpayProp:      0,
+				FulamtOwnpayAmt:  0,
+				OverlmtAmt:       0,
+				PreselfpayAmt:    0,
+				Status:           1,
+				Mtime:            time.Now().Unix(),
+				Ctime:            time.Now().Unix(),
+				UserOrgId:        adminUser.CurrentOrgId,
+				HisPatientId:     record.ID,
+				OrderId:          0,
+				ProjectId:        project_id,
+				Type:             types,
+				SettleType:       settle_accounts_type,
 			}
+			service.CreateOrderInfo(info)
+		}
 
-			service.UpDatePrescriptionOrderStatus(adminUser.CurrentOrgId, ids)
-			service.UpDatePrescriptionNumber(adminUser.CurrentOrgId, ids, record.Number)
-			service.UpDatePrescriptionInfoNumber(adminUser.CurrentOrgId, record.PatientId, record.Number, recordDateTime)
+		err := service.UpDatePrescriptionOrderStatus(adminUser.CurrentOrgId, ids)
+		service.UpDatePrescriptionNumber(adminUser.CurrentOrgId, ids, record.Number)
+		service.UpDatePrescriptionInfoNumber(adminUser.CurrentOrgId, record.PatientId, record.Number, recordDateTime)
+		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"msg": "上传费用明细成功",
 			})
+			return
+		} else {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+		}
 
+	} else {
+
+		for _, subItem := range customs {
+			temp := strings.Split(subItem.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:        subItem.FeedetlSn,
+				UploadDate:       recordDateTime,
+				AdviceId:         advice_id,
+				DetItemFeeSumamt: subItem.DetItemFeeSumamt,
+				Cnt:              subItem.Cut,
+				Pric:             float64(subItem.Price),
+				PatientId:        record.PatientId,
+				PricUplmtAmt:     0,
+				SelfpayProp:      0,
+				FulamtOwnpayAmt:  0,
+				OverlmtAmt:       0,
+				PreselfpayAmt:    0,
+				Status:           1,
+				Mtime:            time.Now().Unix(),
+				Ctime:            time.Now().Unix(),
+				UserOrgId:        adminUser.CurrentOrgId,
+				HisPatientId:     record.ID,
+				OrderId:          0,
+				ProjectId:        project_id,
+				Type:             types,
+				SettleType:       settle_accounts_type,
+			}
+			service.CreateOrderInfo(info)
 		}
+
+		service.UpDatePrescriptionOrderStatus(adminUser.CurrentOrgId, ids)
+		service.UpDatePrescriptionNumber(adminUser.CurrentOrgId, ids, record.Number)
+		service.UpDatePrescriptionInfoNumber(adminUser.CurrentOrgId, record.PatientId, record.Number, recordDateTime)
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "上传费用明细成功",
+		})
+
 	}
 }
 

service/his_hospital_service.go

@@ -444,7 +444,7 @@ func GetZHHisPrescription(org_id int64, patient_id int64, record_date int64) (pr
 			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")
+			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").Preload("GoodInfo", "status = 1")
@@ -460,7 +460,7 @@ func GetZHMonthHisPrescription(org_id int64, patient_id int64, start_time int64,
 			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")
+			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").Preload("GoodInfo", "status = 1")

service/his_service.go

@@ -854,7 +854,7 @@ func SavePatientPrescriptionInfo(info models.HisPrescriptionInfo) (err error) {
 	return
 }
 
-func GetHisOrderList(user_org_id int64, page int64, limit int64, start_time int64, end_time int64, doctor_id int64, keywords string, p_type int64, sort_type int64) (order []*models.HisOrder, err error, total int64) {
+func GetHisOrderList(user_org_id int64, page int64, limit int64, start_time_timestamp int64, end_time_timestamp int64, doctor_id int64, keywords string, p_type int64, sort_type int64, start_time string, end_time string) (order []*models.HisOrder, err error, total int64) {
 	offset := (page - 1) * limit
 	db := readDb.Model(&models.HisOrder{})
 
@@ -868,15 +868,23 @@ func GetHisOrderList(user_org_id int64, page int64, limit int64, start_time int6
 
 	}
 
-	if start_time != 0 {
-		db = db.Where("his_order.settle_accounts_date>=?", start_time)
-	}
-	if end_time != 0 {
-		db = db.Where("his_order.settle_accounts_date<=?", end_time)
-	}
+	if sort_type == 1 {
+		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)
+		}
+	} else {
 
+		if len(start_time) != 0 {
+			db = db.Where("his_order.setl_time>=?", start_time+" 00:00:00")
+		}
+		if len(end_time) != 0 {
+			db = db.Where("his_order.setl_time<=?", end_time+" 23:59:59")
+		}
+	}
 	db = db.Where("his_order.status = 1 AND his_order.user_org_id = ? AND his_order.p_type = ? AND his_order.order_status = 2", user_org_id, p_type)
-
 	db = db.Preload("HisOrderInfo", "status = 1 AND user_org_id = ?", user_org_id).
 		Preload("Patients", "status = 1 AND user_org_id = ?", user_org_id).
 		Preload("HisPatient", "status = 1 AND user_org_id = ?", user_org_id).
@@ -886,18 +894,18 @@ func GetHisOrderList(user_org_id int64, page int64, limit int64, start_time int6
 	db = db.Limit(limit).Offset(offset)
 	if user_org_id == 10215 {
 		if sort_type == 1 {
-			err = db.Order("settle_accounts_date asc,ctime asc").Find(&order).Error
+			err = db.Order("settle_accounts_date asc,ctime asc").Group("his_order.id").Find(&order).Error
 		}
 		if sort_type == 2 {
-			err = db.Order("setl_time asc,ctime asc").Find(&order).Error
+			err = db.Order("setl_time asc,ctime asc").Group("his_order.id").Find(&order).Error
 		}
 
 	} else {
 		if sort_type == 1 {
-			err = db.Order("settle_accounts_date desc,ctime desc").Find(&order).Error
+			err = db.Order("settle_accounts_date desc,ctime desc").Group("his_order.id").Find(&order).Error
 		}
 		if sort_type == 2 {
-			err = db.Order("setl_time desc,ctime desc").Find(&order).Error
+			err = db.Order("setl_time desc,ctime desc").Group("his_order.id").Find(&order).Error
 		}
 	}
 
@@ -1699,6 +1707,7 @@ type MedicalInsuranceCostCompare struct {
 	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"`
+	ClrType   string  `gorm:"column:clr_type" json:"clr_type" form:"clr_type"`
 }
 
 func (MedicalInsuranceCostCompare) TableName() string {
@@ -1810,6 +1819,7 @@ type CustomAccountFormData struct {
 	PsnCashPay         float64 `gorm:"column:psn_cash_pay" json:"psn_cash_pay" form:"psn_cash_pay"`
 	AcctPay            float64 `gorm:"column:acct_pay" json:"acct_pay" form:"acct_pay"`
 	CashPay            float64 `gorm:"column:cash_pay" json:"cash_pay" form:"cash_pay"`
+	HifpPay            float64 `gorm:"column:hifp_pay" json:"hifp_pay" form:"hifp_pay"`
 	Sumamt             float64 `gorm:"column:sumamt" json:"sumamt" form:"sumamt"`
 	Iinfo              string  `gorm:"column:iinfo" json:"iinfo" form:"iinfo"`
 	DiagnosisId        string  `gorm:"column:diagnosis_id" json:"diagnosis_id" form:"diagnosis_id"`
@@ -1823,8 +1833,14 @@ type CustomAccountFormData struct {
 	SetlDetail         string  `gorm:"column:setl_detail" json:"setl_detail" form:"setl_detail"`
 }
 
-func GetCheckAccountFormData(start_time int64, end_time int64, org_id int64, insutype string) (cus []*CustomAccountFormData, err error) {
-	err = readDb.Raw("select o.setl_detail as setl_detail, o.maf_pay as maf_pay,  o.hifmi_pay  as hifmi_pay, o.hifob_pay as hifob_pay, o.cvlserv_pay as cvlserv_pay, o.hifes_pay as hifes_pay, o.patient_id as patient_id, p.diagnosis as diagnosis_id, p.iinfo as iinfo, o.medfee_sumamt as medfee_sumamt ,o.psn_name as psn_name ,p.id_card_no as id_card_no ,o.psn_no as psn_no, o.mdtrt_id as mdtrt_id, o.settle_accounts_date as settle_accounts_date,o.act_pay_dedc as act_pay_dedc,O.fund_pay_sumamt as fund_pay_sumamt,o.psn_cash_pay as psn_cash_pay ,o.acct_pay as acct_pay,o.psn_cash_pay as cash_pay,o.medfee_sumamt as sumamt  from his_order o  Join his_patient p On o.patient_id = p.patient_id AND o.settle_accounts_date = p.record_date where o.user_org_id = ? AND o.status = 1 AND o.order_status = 2  AND o.settle_accounts_date >= ? AND o.settle_accounts_date <= ? AND o.insutype = ? Group by o.id", org_id, start_time, end_time, insutype).Scan(&cus).Error
+func GetCheckAccountFormData(start_time int64, end_time int64, org_id int64, insutype string, clr_type string) (cus []*CustomAccountFormData, err error) {
+	if clr_type == "9903" {
+
+		err = readDb.Raw("select o.setl_detail as setl_detail, o.maf_pay as maf_pay,  o.hifmi_pay  as hifmi_pay, o.hifob_pay as hifob_pay, o.cvlserv_pay as cvlserv_pay, o.hifes_pay as hifes_pay, o.patient_id as patient_id, p.diagnosis as diagnosis_id, p.iinfo as iinfo, o.medfee_sumamt as medfee_sumamt ,o.psn_name as psn_name ,p.id_card_no as id_card_no ,o.psn_no as psn_no, o.mdtrt_id as mdtrt_id, o.settle_accounts_date as settle_accounts_date,o.act_pay_dedc as act_pay_dedc,O.fund_pay_sumamt as fund_pay_sumamt,o.psn_cash_pay as psn_cash_pay ,o.acct_pay as acct_pay,o.psn_cash_pay as cash_pay,o.medfee_sumamt as sumamt,o.hifp_pay as hifp_pay  from his_order o  Join his_patient p On o.patient_id = p.patient_id AND o.settle_accounts_date = p.record_date where o.user_org_id = ? AND o.status = 1 AND o.order_status = 2  AND o.settle_accounts_date >= ? AND o.settle_accounts_date <= ? AND o.insutype = ? AND o.clr_type = ? Group by o.id", org_id, start_time, end_time, insutype, clr_type).Scan(&cus).Error
+	} else {
+		err = readDb.Raw("select o.setl_detail as setl_detail, o.maf_pay as maf_pay,  o.hifmi_pay  as hifmi_pay, o.hifob_pay as hifob_pay, o.cvlserv_pay as cvlserv_pay, o.hifes_pay as hifes_pay, o.patient_id as patient_id, p.diagnosis as diagnosis_id, p.iinfo as iinfo, o.medfee_sumamt as medfee_sumamt ,o.psn_name as psn_name ,p.id_card_no as id_card_no ,o.psn_no as psn_no, o.mdtrt_id as mdtrt_id, o.settle_accounts_date as settle_accounts_date,o.act_pay_dedc as act_pay_dedc,O.fund_pay_sumamt as fund_pay_sumamt,o.psn_cash_pay as psn_cash_pay ,o.acct_pay as acct_pay,o.psn_cash_pay as cash_pay,o.medfee_sumamt as sumamt,o.hifp_pay as hifp_pay  from his_order o  Join his_patient p On o.patient_id = p.patient_id AND o.settle_accounts_date = p.record_date where o.user_org_id = ? AND o.status = 1 AND o.order_status = 2  AND o.settle_accounts_date >= ? AND o.settle_accounts_date <= ? AND o.insutype = ? AND o.clr_type <> 9903 Group by o.id", org_id, start_time, end_time, insutype).Scan(&cus).Error
+
+	}
 
 	for _, item := range cus {
 		var total int64