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

controllers/dialysis_api_controller.go

@@ -322,7 +322,7 @@ func (c *DialysisApiController) PostPrescription() {
 		PreImpulse:                 preImpules,
 		AnticoagulantStopTimeHour:  anticoagulant_stop_time_hour,
 		AnticoagulantStopTimeMin:   anticoagulant_stop_time_min,
-		Blood:                      blood,
+		Blood: blood,
 	}
 
 	if appRole.UserType == 2 || appRole.UserType == 1 {
@@ -578,7 +578,7 @@ func (c *DialysisApiController) PostSoulution() {
 
 		AnticoagulantStopTimeHour: anticoagulant_stop_time_hour,
 		AnticoagulantStopTimeMin:  anticoagulant_stop_time_min,
-		Blood:                     blood,
+		Blood: blood,
 	}
 
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(patient, recordDate.Unix(), adminUserInfo.CurrentOrgId)
@@ -2512,8 +2512,8 @@ func (c *DialysisApiController) CreateRemindDoctorAdvice() {
 	}
 	utils.ErrorLog("%v", dataBody)
 
-	//timeLayout := "2006-01-02 15:04"
-	//loc, _ := time.LoadLocation("Local")
+	timeLayout := "2006-01-02 15:04"
+	loc, _ := time.LoadLocation("Local")
 
 	timeLayout2 := "2006-01-02"
 	loc2, _ := time.LoadLocation("Local")
@@ -2543,7 +2543,7 @@ func (c *DialysisApiController) CreateRemindDoctorAdvice() {
 		utils.ErrorLog("len(start_time) == 0")
 		return
 	}
-	theTimeUnix, err := time.ParseInLocation(timeLayout2, startTime, loc2)
+	theTimeUnix, err := time.ParseInLocation(timeLayout, startTime, loc)
 	if err != nil {
 		utils.ErrorLog(err.Error())
 		return

controllers/gdyb_controller.go

@@ -70,8 +70,9 @@ func (c *GdybController) PostOne() {
 	certNo := c.GetString("cert_no")
 	org_name := c.GetString("org_name")
 	doctor := c.GetString("doctor")
+	fixmedins_code := c.GetString("fixmedins_code")
 
-	result := service.Gdyb1101(certNo, org_name, doctor)
+	result := service.Gdyb1101(certNo, org_name, doctor, fixmedins_code)
 
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
@@ -91,8 +92,9 @@ func (c *GdybController) PostTwo() {
 	doctor := c.GetString("doctor")
 	ipt_otp_no := c.GetString("ipt_otp_no")
 	dept := c.GetString("dept")
+	fixmedins_code := c.GetString("fixmedins_code")
 
-	result := service.Gdyb2201(psnNo, insutype, certNo, org_name, doctor, ipt_otp_no, dept)
+	result := service.Gdyb2201(psnNo, insutype, certNo, org_name, doctor, ipt_otp_no, dept, fixmedins_code)
 
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
@@ -125,10 +127,17 @@ func (c *GdybController) PostFour() {
 	department := c.GetString("department")
 	diag := c.GetString("diag")
 	org_name := c.GetString("org_name")
+	med_type := c.GetString("med_type")
+	doctor_id, _ := c.GetInt64("doctor_id", 0)
+	fixmedins_code := c.GetString("fixmedins_code")
 
-	result := service.Gdyb2203(psnNo, mdtrtId, doctor, department, diag, org_name)
+	result := service.Gdyb2203(psnNo, mdtrtId, doctor, department, diag, org_name, med_type, doctor_id, fixmedins_code)
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+	} else {
+	}
 	c.ServeSuccessJSON(map[string]interface{}{
-		"pre": result,
+		"pre": dat,
 	})
 }
 
@@ -169,7 +178,8 @@ func (c *GdybController) PostFive() {
 		utils.ErrorLog("解析失败：%v", err)
 		return
 	}
-	result := service.Gdyb2204(respJSON["psn_no"].(string), respJSON["mdtrt_id"].(string), hp, respJSON["chrg_bchno"].(string), respJSON["org_name"].(string), respJSON["doctor"].(string), respJSON["dept"].(string))
+
+	result := service.Gdyb2204(respJSON["psn_no"].(string), respJSON["mdtrt_id"].(string), hp, respJSON["chrg_bchno"].(string), respJSON["org_name"].(string), respJSON["doctor"].(string), respJSON["dept"].(string), respJSON["fixmedins_code"].(string))
 
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
@@ -227,8 +237,9 @@ func (c *GdybController) PostEight() {
 	total := c.GetString("total")
 	org_name := c.GetString("org_name")
 	doctor := c.GetString("doctor")
+	fixmedins_code := c.GetString("fixmedins_code")
 
-	result := service.Gdyb2207(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, doctor)
+	result := service.Gdyb2207(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, doctor, fixmedins_code)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 		fmt.Println(dat)

models/his_models.go

@@ -264,6 +264,7 @@ type HisPrescriptionInfo struct {
 	PrescriptionNumber string `gorm:"column:prescription_number" json:"prescription_number" form:"prescription_number"`
 	PrescriptionStatus int64  `gorm:"column:prescription_status" json:"prescription_status" form:"prescription_status"`
 	BatchNumber        string `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	DoctorId           int64  `gorm:"column:doctor_id" json:"doctor_id" form:"doctor_id"`
 }
 
 func (HisPrescriptionInfo) TableName() string {
@@ -553,7 +554,7 @@ type HisOrder struct {
 	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           time.Time `gorm:"column:setl_time" json:"setl_time" form:"setl_time"`
+	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"`
@@ -581,11 +582,7 @@ type HisOrder struct {
 	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"`
-	FundPayType        string    `gorm:"column:fund_pay_type" json:"fund_pay_type" form:"fund_pay_type"`
-	CrtPaybLmtAmt      float64   `gorm:"column:crt_payb_lmt_amt" json:"crt_payb_lmt_amt" form:"crt_payb_lmt_amt"`
-	FundPayamt         float64   `gorm:"column:fund_payamt" json:"fund_payamt" form:"fund_payamt"`
-	FundPayTypeName    string    `gorm:"column:fund_pay_type_name" json:"fund_pay_type_name" form:"fund_pay_type_name"`
-	SetlProcInfo       string    `gorm:"column:setl_proc_info" json:"setl_proc_info" form:"setl_proc_info"`
+	SetlDetail         string    `gorm:"column:setl_detail" json:"setl_detail" form:"setl_detail"`
 
 	HisOrderInfo        HisOrderInfo        `gorm:"ForeignKey:ID;AssociationForeignKey:OrderId" json:"order_info"`
 	Patients            Patients            `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
@@ -693,3 +690,38 @@ type MedicalInsuranceConfig struct {
 func (MedicalInsuranceConfig) TableName() string {
 	return "medical_insurance_config"
 }
+
+type HisOrderError 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"`
+	Ctime      int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime      int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Number     string `gorm:"column:number" json:"number" form:"number"`
+	ErrMsg     string `gorm:"column:err_msg" json:"err_msg" form:"err_msg"`
+	Status     int64  `gorm:"column:status" json:"status" form:"status"`
+	PatientId  int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	RecordTime int64  `gorm:"column:record_time" json:"record_time" form:"record_time"`
+	Stage      int64  `gorm:"column:stage" json:"stage" form:"stage"`
+}
+
+func (HisOrderError) TableName() string {
+	return "his_order_error"
+}
+
+type MedicalInsuranceOrgConfig struct {
+	ID            int64  `gorm:"column:id" json:"id" form:"id"`
+	Code          string `gorm:"column:code" json:"code" form:"code"`
+	OrgName       string `gorm:"column:org_name" json:"org_name" form:"org_name"`
+	Vpn           string `gorm:"column:vpn" json:"vpn" form:"vpn"`
+	EleCardId     string `gorm:"column:ele_card_id" json:"ele_card_id" form:"ele_card_id"`
+	EleCardKey    string `gorm:"column:ele_card_key" json:"ele_card_key" form:"ele_card_key"`
+	ChannelNumber string `gorm:"column:channel_number" json:"channel_number" form:"channel_number"`
+	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"`
+	UserOrgId     int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+}
+
+func (MedicalInsuranceOrgConfig) TableName() string {
+	return "medical_insurance_org_config"
+}

service/gdyb_service.go

@@ -16,19 +16,18 @@ import (
 )
 
 const (
-	SceretKey     = "RhaDw4H0RUbWYyTxmRKM1eSeN0qyGLds" //     secretKey 私钥
-	FixmedinsCOde = "H44022900158"                     // 定点医药机构编号
+	SceretKey = "RhaDw4H0RUbWYyTxmRKM1eSeN0qyGLds" //     secretKey 私钥
 )
 
 // 人员基本信息
-func Gdyb1101(certNo string, org_name string, doctor string) string {
+func Gdyb1101(certNo string, org_name string, doctor string, fixmedins_code string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
 	signature := setSignature(timestamp, nonce)
 
 	// 生成输入报文
-	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor)
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "1101"      // 交易编码
@@ -80,7 +79,7 @@ func Gdyb1101(certNo string, org_name string, doctor string) string {
 }
 
 // 门诊挂号
-func Gdyb2201(psnNo string, insutype string, certNo string, org_name string, doctor string, ipt_otp_no string, dept string) string {
+func Gdyb2201(psnNo string, insutype string, certNo string, org_name string, doctor string, ipt_otp_no string, dept string, fixmedins_code string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -89,7 +88,7 @@ func Gdyb2201(psnNo string, insutype string, certNo string, org_name string, doc
 	timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
 
 	// 生成输入报文
-	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor)
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "2201"        // 交易编码
@@ -153,7 +152,7 @@ func Gdyb2202(psnNo string, mdtrtId string, ipt_otp_no string, org_name string,
 	signature := setSignature(timestamp, nonce)
 
 	// 生成输入报文
-	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor)
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, "")
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "2202"       // 交易编码
@@ -202,7 +201,7 @@ func Gdyb2202(psnNo string, mdtrtId string, ipt_otp_no string, org_name string,
 }
 
 // 门诊就诊信息上传
-func Gdyb2203(psnNo string, mdtrtId string, doctor string, department string, diag string, org_name string) string {
+func Gdyb2203(psnNo string, mdtrtId string, doctor string, department string, diag string, org_name string, med_type string, doctor_id int64, fixmedins_code string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -211,7 +210,7 @@ func Gdyb2203(psnNo string, mdtrtId string, doctor string, department string, di
 	timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
 
 	// 生成输入报文
-	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor)
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	diseinfo := make([]map[string]interface{}, 0)
@@ -219,7 +218,7 @@ func Gdyb2203(psnNo string, mdtrtId string, doctor string, department string, di
 	inputMessage["infno"] = "2203"        // 交易编码
 	inputData["mdtrt_id"] = mdtrtId       // 就诊 ID（来自2201接口返回）
 	inputData["psn_no"] = psnNo           // 人员编号 （来自1101接口返回）
-	inputData["med_type"] = "11"          // 医疗类别 16门诊特殊病
+	inputData["med_type"] = med_type      // 医疗类别 16门诊特殊病
 	inputData["begntime"] = timeFormatOne // 开始时间
 	inputData["main_cond_dscr"] = ""      // 主要病情描述
 	inputData["dise_codg"] = ""           // 病种编码
@@ -233,7 +232,7 @@ func Gdyb2203(psnNo string, mdtrtId string, doctor string, department string, di
 	diseinfo_sun["diag_code"] = "A04.902"     // 诊断代码
 	diseinfo_sun["diag_name"] = diag          // 诊断名称
 	diseinfo_sun["diag_dept"] = department    // 诊断科室
-	diseinfo_sun["dise_dor_no"] = "1002"      // 诊断医生编码
+	diseinfo_sun["dise_dor_no"] = doctor_id   // 诊断医生编码
 	diseinfo_sun["dise_dor_name"] = doctor    // 诊断医生姓名
 	diseinfo_sun["diag_time"] = timeFormatOne // 诊断时间
 	diseinfo_sun["vali_flag"] = "1"           // 有效标志
@@ -335,7 +334,7 @@ type Result struct {
 }
 
 //  门诊费用明细信息上传
-func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescription, chrg_bchno string, org_name string, doctor string, dept string) string {
+func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescription, chrg_bchno string, org_name string, doctor string, dept string, fixmedins_code string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -383,10 +382,8 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 		}
 	}
 
-	fmt.Println(customs)
-
 	// 生成输入报文
-	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor)
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code)
 	input := make(map[string]interface{})
 	feedetail := make([]map[string]interface{}, 0)
 	inputMessage["infno"] = "2204" // 交易编码
@@ -403,7 +400,7 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 		feedetailInfo["rx_circ_flag"] = "0"                          // 外购处方标志
 		feedetailInfo["fee_ocur_time"] = timeFormatOne               // 费用发生时间
 		feedetailInfo["med_list_codg"] = item.MedListCodg            // 医疗目录编码
-		feedetailInfo["medins_list_codg"] = FixmedinsCOde            // 医药机构目录编码
+		feedetailInfo["medins_list_codg"] = fixmedins_code           // 医药机构目录编码
 		feedetailInfo["det_item_fee_sumamt"] = item.DetItemFeeSumamt // 明细项目费用总额
 		feedetailInfo["cnt"] = item.Cut                              // 数量
 		feedetailInfo["pric"] = item.Price                           // 单价
@@ -479,7 +476,7 @@ func Gdyb2205(psnNo string, mdtrtId string, chrgBchno string, org_name string, d
 	signature := setSignature(timestamp, nonce)
 
 	// 生成输入报文
-	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor)
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, "")
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "2205" // 交易编码
@@ -539,7 +536,7 @@ func Gdyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	signature := setSignature(timestamp, nonce)
 
 	// 生成输入报文
-	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor)
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, "")
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "2206" // 交易编码
@@ -596,14 +593,14 @@ func Gdyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 }
 
 //  门诊结算
-func Gdyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, insutype string, total string, org_name string, doctor string) string {
+func Gdyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, insutype string, total string, org_name string, doctor string, fixmedins_code string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
 	signature := setSignature(timestamp, nonce)
 
 	// 生成输入报文
-	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor)
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "2207" // 交易编码
@@ -668,7 +665,7 @@ func Gdyb2208(psnNo string, mdtrtId string, setlId string, org_name string, doct
 	signature := setSignature(timestamp, nonce)
 
 	// 生成输入报文
-	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor)
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, "")
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "2208" // 交易编码
@@ -938,7 +935,7 @@ func GetRandomString(l int) string {
 }
 
 // 生成基础报文
-func SetInputMessage(nonce string, timestamp int64, org_name string, doctor string) map[string]interface{} {
+func SetInputMessage(nonce string, timestamp int64, org_name string, doctor string, fixmedins_code string) map[string]interface{} {
 	// 生成签名
 	tempTime := time.Unix(timestamp, 0)
 	timeFormat := tempTime.Format("20060102150405")
@@ -949,7 +946,7 @@ func SetInputMessage(nonce string, timestamp int64, org_name string, doctor stri
 	inputMessage := make(map[string]interface{})
 
 	inputMessage["infno"] = "1101"                                                              // 交易编码
-	inputMessage["msgid"] = "H44022900158" + timeFormat + strconv.FormatInt(int64(randNum), 10) // 发送方报文 ID
+	inputMessage["msgid"] = fixmedins_code + timeFormat + strconv.FormatInt(int64(randNum), 10) // 发送方报文 ID
 	inputMessage["mdtrtarea_admvs"] = "440200"                                                  // 就医地医保区划
 	inputMessage["insuplc_admdvs"] = "440200"                                                   // 参保地医保区划
 	inputMessage["recer_sys_code"] = "01"                                                       // 接收方系统代码
@@ -962,19 +959,12 @@ func SetInputMessage(nonce string, timestamp int64, org_name string, doctor stri
 	inputMessage["opter"] = "mockuser"                                                          // 经办人
 	inputMessage["opter_name"] = doctor                                                         // 经办人姓名
 	inputMessage["inf_time"] = timeFormatOne                                                    // 交易时间
-	inputMessage["fixmedins_code"] = FixmedinsCOde                                              // 定点医药机构编号
-	inputMessage["fixmedins_name"] = ""                                                         //定点医药机构名称
+	inputMessage["fixmedins_code"] = fixmedins_code                                             // 定点医药机构编号
+	inputMessage["fixmedins_name"] = org_name                                                   //定点医药机构名称
 	inputMessage["sign_no"] = ""                                                                //交易签到流水号
 	return inputMessage
 }
 
-func FindHisRegisterRecord(record_time int64, patient_id int64, org_id int64) (total int64, err error) {
-
-	err = readDb.Model(&models.VMHisPatient{}).Where("status = 1 AND user_org_id = ? AND patient_id = ? AND record_date = ?", org_id, patient_id, record_time).Count(&total).Error
-
-	return
-}
-
 func Gdyb1201(psnNo string, org_name string, doctor string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
@@ -982,13 +972,13 @@ func Gdyb1201(psnNo string, org_name string, doctor string) string {
 	signature := setSignature(timestamp, nonce)
 
 	// 生成输入报文
-	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor)
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, "")
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
-	inputMessage["infno"] = "1201"             // 交易编码
-	inputData["fixmedins_type"] = psnNo        // 人员编号 （来自1101接口返回）
-	inputData["fixmedins_name"] = "翁源沅胜血液透析中心" // 人员编号 （来自1101接口返回）
-	inputData["fixmedins_code"] = ""           // 人员编号 （来自1101接口返回）
+	inputMessage["infno"] = "1201"         // 交易编码
+	inputData["fixmedins_type"] = psnNo    // 人员编号 （来自1101接口返回）
+	inputData["fixmedins_name"] = org_name // 人员编号 （来自1101接口返回）
+	inputData["fixmedins_code"] = ""       // 人员编号 （来自1101接口返回）
 
 	input["medinsinfo"] = inputData
 	inputMessage["input"] = input //交易输入

service/his_service.go

@@ -265,7 +265,7 @@ func UpDatePrescriptionNumber(user_org_id int64, ids []int64, number string) (er
 }
 
 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, "status": 2, "mtime": time.Now().Unix()}).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": 3, "mtime": time.Now().Unix()}).Error
 
 	return
 }
@@ -335,6 +335,7 @@ type HisPrescriptionInfo struct {
 	PrescriptionNumber string            `gorm:"column:prescription_number" json:"prescription_number" form:"prescription_number"`
 	BatchNumber        string            `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
 	PrescriptionStatus int64             `gorm:"column:prescription_status" json:"prescription_status" form:"prescription_status"`
+	DoctorId           int64             `gorm:"column:doctor_id" json:"doctor_id" form:"doctor_id"`
 }
 
 func (HisPrescriptionInfo) TableName() string {
@@ -377,7 +378,47 @@ func GetMedicalInsuranceConfig(org_id int64) (medicalInsuranceConfig models.Medi
 func UpdataOrderStatus(id int64, number string, user_org_id int64) (err error) {
 	err = writeDb.Model(&models.HisOrder{}).Where("status = 1 AND id = ? AND user_org_id = ?", id, user_org_id).Updates(map[string]interface{}{"order_status": 3, "mtime": time.Now().Unix()}).Error
 	err = writeDb.Model(&models.HisPrescription{}).Where("status = 1 AND batch_number = ? AND user_org_id = ?", number, user_org_id).Updates(map[string]interface{}{"order_status": 3, "mtime": time.Now().Unix()}).Error
-	err = writeDb.Model(&models.HisPrescriptionInfo{}).Where("status = 1 AND batch_number = ? AND user_org_id = ?", number, user_org_id).Updates(map[string]interface{}{"order_status": 4, "mtime": time.Now().Unix()}).Error
+	err = writeDb.Model(&models.HisPrescriptionInfo{}).Where("status = 1 AND batch_number = ? AND user_org_id = ?", number, user_org_id).Updates(map[string]interface{}{"prescription_status": 4, "mtime": time.Now().Unix()}).Error
+
+	return
+
+}
+
+func GetAdminUserInfoByID(org_id int64, admin_user_id int64) (role models.UserAdminRole, err error) {
+	err = readUserDb.Model(&models.UserAdminRole{}).Where("org_id = ? AND status = 1 AND admin_user_id = ?", org_id, admin_user_id).First(&role).Error
+	return
+}
+
+func GetHisOrderTwo(user_org_id int64, number string, patient_id int64) (order models.HisOrder, err error) {
+	err = readDb.Model(&HisOrder{}).Where("status = 1 AND user_org_id = ? AND patient_id = ? AND number=?", user_org_id, patient_id, number).
+		First(&order).Error
+	return
+}
+
+func UpDateOrder(order models.HisOrder) (err error) {
+	err = writeDb.Save(&order).Error
+	return
+}
+
+func UpdataOrderStatusTwo(number string, user_org_id int64) (err error) {
+	err = writeDb.Model(&models.HisPrescription{}).Where("status = 1 AND batch_number = ? AND user_org_id = ?", number, user_org_id).Updates(map[string]interface{}{"order_status": 3, "mtime": time.Now().Unix()}).Error
+	err = writeDb.Model(&models.HisPrescriptionInfo{}).Where("status = 1 AND batch_number = ? AND user_org_id = ?", number, user_org_id).Updates(map[string]interface{}{"prescription_status": 3, "mtime": time.Now().Unix()}).Error
 	return
+}
+
+func CreateErrMsgLog(log *models.HisOrderError) {
+	writeDb.Model(&models.HisOrderError{}).Create(&log)
+
+}
 
+func FindHisRegisterRecord(record_time int64, patient_id int64, org_id int64) (total int64, err error) {
+
+	err = readDb.Model(&models.VMHisPatient{}).Where("status = 1 AND user_org_id = ? AND patient_id = ? AND record_date = ?", org_id, patient_id, record_time).Count(&total).Error
+
+	return
+}
+
+func FindMedicalInsuranceInfo(org_id int64) (config models.MedicalInsuranceOrgConfig, err error) {
+	err = readDb.Model(&models.MedicalInsuranceOrgConfig{}).Where("status = 1 AND user_org_id = ?", org_id).First(&config).Error
+	return
 }