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

controllers/coordinate_controller.go

@@ -0,0 +1,639 @@
+package controllers
+
+import (
+	"XT_New/enums"
+	"XT_New/models"
+	"XT_New/service"
+	"XT_New/utils"
+	"encoding/json"
+	"fmt"
+	"github.com/astaxie/beego"
+	"io/ioutil"
+	"math/rand"
+	"strconv"
+	"strings"
+	"time"
+)
+
+type CoordinateController struct {
+	BaseAPIController
+}
+
+type ResultReg struct {
+	ResultCode string `json:"resultCode"`
+	ResultDesc string `json:"resultDesc"`
+	InfoSeq    string `json:"infoSeq"`
+}
+
+type ResultSettle struct {
+	ResultCode string `json:"resultCode"`
+	ResultDesc string `json:"resultDesc"`
+	DocId      string `json:"docId"`
+	Amount     string `json:"amount"`
+}
+
+type ResultCancelSettle struct {
+	ResultCode string `json:"resultCode"`
+	ResultDesc string `json:"resultDesc"`
+}
+
+type Settle struct {
+	PatientId string `json:"resultCode"`
+	DocId     string `json:"docId"`
+	InfoSeq   string `json:"infoSeq"`
+}
+
+type Refund struct {
+	PatientId string `json:"resultCode"`
+	DocId     string `json:"docId"`
+	InfoSeq   string `json:"infoSeq"`
+}
+
+type RefundDetail struct {
+	Msg    string `json:"msg"`
+	Result []struct {
+		ResultMsg string `json:"resultMsg"`
+		Code      string `json:"code"`
+		Records   int    `json:"records"`
+		TotalPage int    `json:"totalPage"`
+		List      []struct {
+			Zae01 int64 `json:"ZAE01"`
+		} `json:"list"`
+		RecordsTotal  int    `json:"recordsTotal"`
+		Pagenumber    int    `json:"pagenumber"`
+		Result        string `json:"result"`
+		Total         int    `json:"total"`
+		RecordsFtered int    `json:"recordsFtered"`
+		Page          int    `json:"page"`
+	} `json:"result"`
+	Code string `json:"code"`
+}
+
+func CoordinateRegistRouters() {
+	beego.Router("/coordinate/check", &CoordinateController{}, "get:SavePatientMessageInfo")
+	//坐标挂号
+	beego.Router("/coordinate/register", &CoordinateController{}, "get:Register")
+	//beego.Router("/coordinate/getWaitPayDetail", &CoordinateController{}, "get:GetWaitPayDetail")
+	//坐标记账
+	beego.Router("/coordinate/opKeepAccounts", &CoordinateController{}, "get:OpKeepAccounts")
+	//坐标撤销记账
+	beego.Router("/coordinate/opCancelKeepAccounts", &CoordinateController{}, "get:OpCancelKeepAccounts")
+	//坐标结算回调
+	beego.Router("/coordinate/settle", &CoordinateController{}, "post:Settle")
+	//坐标退费回调
+	beego.Router("/coordinate/refund", &CoordinateController{}, "post:Refund")
+
+}
+
+func (c *CoordinateController) Settle() {
+	//参数1 patient_id
+	//参数2 就诊号
+	//参数3 单据id
+	fmt.Println(c.Ctx.Request.Body)
+
+	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
+	fmt.Println(string(body))
+
+	var respJSON map[string]interface{}
+	if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
+		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+		return
+	}
+	patien_id := respJSON["patientId"].(string)
+	infoSeq := respJSON["infoSeq"].(string)
+	docId := respJSON["docId"].(string)
+	fmt.Println(patien_id)
+	fmt.Println(infoSeq)
+	fmt.Println(docId)
+
+	order, _ := service.GetHisOrderFour(patien_id, infoSeq, docId)
+	if order.ID == 0 {
+		json := make(map[string]interface{})
+		json["msg"] = "结算记录不存在，请检查参数是否正确"
+		json["code"] = "-1"
+		c.Data["json"] = json
+		c.ServeJSON()
+		return
+	}
+	order.OrderStatus = 2
+	service.UpDateOrder(order)
+	service.UpdataOrderStatusTwo(order.Number, order.UserOrgId)
+	json := make(map[string]interface{})
+	json["msg"] = "结算成功"
+	json["code"] = "0"
+	c.Data["json"] = json
+	c.ServeJSON()
+	return
+}
+func (c *CoordinateController) Refund() {
+	//参数1 patient_id
+	//参数2 就诊号
+	//参数3 单据id
+	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
+	var respJSON map[string]interface{}
+	if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
+		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+		return
+	}
+	patien_id := respJSON["patientId"].(string)
+	infoSeq := respJSON["infoSeq"].(string)
+	docId := respJSON["docId"].(string)
+	order, _ := service.GetHisOrderFour(patien_id, infoSeq, docId)
+	if order.ID == 0 {
+		json := make(map[string]interface{})
+		json["msg"] = "结算记录不存在，请检查参数是否正确"
+		json["code"] = "-1"
+		c.Data["json"] = json
+		c.ServeJSON()
+		return
+	}
+	service.UpdataOrderStatus(order.ID, order.Number, order.UserOrgId)
+	json := make(map[string]interface{})
+	json["msg"] = "退费成功"
+	json["code"] = "0"
+	c.Data["json"] = json
+	c.ServeJSON()
+	return
+}
+
+func (c *CoordinateController) SavePatientMessageInfo() {
+	result, request_log := service.SavePatientMessageInfo()
+	fmt.Println(result)
+	fmt.Println(request_log)
+
+}
+
+func (c *CoordinateController) Register() {
+	patient_id, _ := c.GetInt64("patient_id")
+	diagnosis_time := c.GetString("diagnosis_time")
+	record_date := c.GetString("record_date")
+	admin_user_id, _ := c.GetInt64("admin_user_id")
+	org_id, _ := c.GetInt64("org_id")
+	org_id = 4
+	patient, _ := service.GetPatientByID(org_id, patient_id)
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	recordDateTime := theTime.Unix()
+	patientPrescription, _ := service.FindPatientPrescriptionInfoTwo(org_id, patient.ID, recordDateTime, 2)
+	if patientPrescription.ID == 0 {
+		patientPrescription, _ = service.FindLastPatientPrescriptionInfo(org_id, patient.ID, recordDateTime)
+	}
+	//department, _ := service.GetDepartMentDetail(patientPrescription.Departments)
+	doctor_info, _ := service.GetAdminUserInfoByID(org_id, patientPrescription.DoctorId)
+
+	//admin_user_info, _ := service.GetAdminUserInfoByID(org_id, admin_user_id)
+
+	reg := models.Reg{
+		DeptId:      "0112",
+		PatientId:   patient.ZbPatientId,
+		PatientName: patient.Name,
+		DoctorId:    doctor_info.DoctorNumber,
+		RegDate:     strings.Split(diagnosis_time, " ")[0],
+		RegFee:      "8",
+		TreatFee:    "10",
+		OperatorId:  "测试",
+		IdCardNo:    patient.IdCardNo,
+	}
+
+	result, request_log := service.SaveReg(reg)
+	fmt.Println(result)
+	fmt.Println(request_log)
+
+	var res ResultReg
+	//if err := json.Unmarshal([]byte(result), &res); err != nil {
+	//	utils.ErrorLog("解析失败：%v", err)
+	//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	//	return
+	//}
+	res.ResultCode = "0"
+	res.InfoSeq = "122333"
+	if res.ResultCode == "0" {
+		timestamp := time.Now().Unix()
+		tempTime := time.Unix(timestamp, 0)
+		timeFormat := tempTime.Format("20060102150405")
+		chrgBchno := rand.Intn(100000) + 10000
+		ipt_otp_no := timeFormat + strconv.FormatInt(int64(chrgBchno), 10) + strconv.FormatInt(patient.ID, 10)
+		his := models.VMHisPatient{
+			Name:                   patient.Name,
+			Gender:                 patient.Gender,
+			Birthday:               patient.Birthday,
+			MedicalTreatmentType:   0,
+			IdType:                 1,
+			IdCardNo:               patient.IdCardNo,
+			BalanceAccountsType:    1,
+			MedicalInsuranceNumber: "",
+			RegisterType:           0,
+			RegisterCost:           0,
+			TreatmentCost:          0,
+			Status:                 1,
+			Ctime:                  time.Now().Unix(),
+			Mtime:                  time.Now().Unix(),
+			PsnNo:                  patient.ZbPatientId,
+			PsnCertType:            "",
+			Certno:                 patient.IdCardNo,
+			PsnName:                patient.Name,
+			Gend:                   "",
+			Naty:                   "",
+			Brdy:                   "",
+			Age:                    0,
+			Iinfo:                  "",
+			Idetinfo:               "",
+			PatientId:              patient.ID,
+			RecordDate:             theTime.Unix(),
+			UserOrgId:              org_id,
+			AdminUserId:            admin_user_id,
+			IsReturn:               1,
+			Doctor:                 patientPrescription.DoctorId,
+			Departments:            patientPrescription.Departments,
+			IptOtpNo:               ipt_otp_no,
+			Number:                 res.InfoSeq,
+			PhoneNumber:            patient.Phone,
+		}
+		service.UpdateHisPatientStatus(&his)
+		service.UpdateHisPrescriptionHisID(his.ID, patient.ID, recordDateTime, org_id)
+		c.ServeSuccessJSON(map[string]interface{}{
+			"his_info": his,
+		})
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeRegisterTwoException)
+		return
+	}
+}
+
+//func (c *CoordinateController) GetWaitPayDetail() {
+//	result, request_log := service.GetWaitPayDetail()
+//	fmt.Println(result)
+//	fmt.Println(request_log)
+//
+//}
+
+func (c *CoordinateController) OpKeepAccounts() {
+	id, _ := c.GetInt64("id")
+	record_time := c.GetString("record_time")
+	his_patient_id, _ := c.GetInt64("his_patient_id")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	settle_accounts_type, _ := c.GetInt64("settle_accounts_type")
+	fapiao_code := c.GetString("fapiao_code")
+	fapiao_number := c.GetString("fapiao_number")
+	diagnosis_id := c.GetString("diagnosis")
+	sick_type, _ := c.GetInt64("sick_type")
+	reg_type, _ := c.GetInt64("p_type")
+	org_id, _ := c.GetInt64("org_id")
+	org_id = 4
+	his, _ := service.GetHisPatientByIdThree(his_patient_id)
+
+	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 prescriptions []*models.HisPrescription
+	var start_time int64
+	var end_time int64
+
+	//ids_str := c.GetString("ids")
+	//ids_arr := strings.Split(ids_str, ",")
+
+	if settle_accounts_type == 1 { //日结
+		//fmt.Println(reg_type)
+		prescriptions, _ = service.GetUnSettleHisPrescriptionFive(org_id, id, recordDateTime, 2)
+
+	} else { //月结
+
+		start_time_str := c.GetString("start_time")
+		end_time_str := c.GetString("end_time")
+		timeLayout := "2006-01-02"
+		loc, _ := time.LoadLocation("Local")
+		theStartTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time_str+" 00:00:00", loc)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		recordStartTime := theStartTime.Unix()
+		start_time = recordStartTime
+		theEndTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time_str+" 00:00:00", loc)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		recordEndTime := theEndTime.Unix()
+		end_time = recordEndTime
+		prescriptions, _ = service.GetUnSettleMonthHisPrescription(org_id, id, recordStartTime, recordEndTime)
+	}
+
+	timestamp := time.Now().Unix()
+	tempTime := time.Unix(timestamp, 0)
+	timeFormat := tempTime.Format("20060102150405")
+	chrgBchno := rand.Intn(100000) + 10000
+	chrg_bchno := timeFormat + strconv.FormatInt(int64(chrgBchno), 10) + strconv.FormatInt(his.PatientId, 10)
+	strconv.FormatInt(his.PatientId, 10)
+
+	var ids []int64
+
+	for _, item := range prescriptions {
+		ids = append(ids, item.ID)
+	}
+	var total float64
+
+	for _, item := range prescriptions {
+		fmt.Println(item)
+		if item.Type == 1 { //药品
+			for _, subItem := range item.HisDoctorAdviceInfo {
+				total = total + (subItem.Price * subItem.PrescribingNumber)
+			}
+		}
+		if item.Type == 2 { //项目
+			for _, subItem := range item.HisPrescriptionProject {
+				cnt, _ := strconv.ParseFloat(subItem.Count, 64)
+				total = total + (subItem.Price * cnt)
+			}
+		}
+
+		for _, subItem := range item.HisAdditionalCharge {
+			total = total + (subItem.Price * float64(subItem.Count))
+		}
+	}
+
+	tm := time.Unix(time.Now().Unix(), 0)
+
+	var customs []*models.NewCustomTwo
+	for _, item := range prescriptions {
+		if item.Type == 1 { //药品
+			for _, subItem := range item.HisDoctorAdviceInfo {
+				cus := &models.NewCustomTwo{
+					AdviceId:         subItem.ID,
+					ProjectId:        0,
+					DetItemFeeSumamt: fmt.Sprintf("%.4f", subItem.Price*subItem.PrescribingNumber),
+					Cut:              fmt.Sprintf("%.4f", subItem.PrescribingNumber),
+					FeedetlSn:        subItem.FeedetlSn,
+					Price:            fmt.Sprintf("%.2f", subItem.Price),
+					MedListCodg:      subItem.Drug.MedicalInsuranceNumber,
+					Type:             1,
+				}
+				customs = append(customs, cus)
+			}
+		}
+		if item.Type == 2 { //项目
+			for _, subItem := range item.HisPrescriptionProject {
+				if subItem.Type == 2 {
+					cnt, _ := strconv.ParseFloat(subItem.Count, 64)
+					cus := &models.NewCustomTwo{
+						AdviceId:         0,
+						ProjectId:        subItem.ID,
+						DetItemFeeSumamt: fmt.Sprintf("%.4f", subItem.Price*cnt),
+						Cut:              fmt.Sprintf("%.4f", cnt),
+						FeedetlSn:        subItem.FeedetlSn,
+						Price:            fmt.Sprintf("%.4f", float64(subItem.Price)),
+						MedListCodg:      subItem.HisProject.MedicalCode,
+						Type:             2,
+					}
+					customs = append(customs, cus)
+
+				} else {
+					cnt, _ := strconv.ParseFloat(subItem.Count, 64)
+					cus := &models.NewCustomTwo{
+						AdviceId:         0,
+						ProjectId:        subItem.ID,
+						DetItemFeeSumamt: fmt.Sprintf("%.4f", subItem.Price*cnt),
+						Cut:              fmt.Sprintf("%.4f", cnt),
+						FeedetlSn:        subItem.FeedetlSn,
+						Price:            fmt.Sprintf("%.4f", float64(subItem.Price)),
+						MedListCodg:      subItem.GoodInfo.MedicalInsuranceNumber,
+						Type:             3,
+					}
+					customs = append(customs, cus)
+
+				}
+
+			}
+		}
+		for _, item := range item.HisAdditionalCharge {
+			cus := &models.NewCustomTwo{
+				ItemId:           item.ID,
+				AdviceId:         0,
+				ProjectId:        0,
+				DetItemFeeSumamt: fmt.Sprintf("%.4f", item.Price),
+				Cut:              fmt.Sprintf("%.4f", float64(item.Count)),
+				FeedetlSn:        item.FeedetlSn,
+				Price:            fmt.Sprintf("%.4f", float64(item.Price)),
+				MedListCodg:      item.XtHisAddtionConfig.Code,
+				Type:             3,
+			}
+			customs = append(customs, cus)
+		}
+	}
+	result, request_log := service.OpKeepAccounts(his.Number, customs)
+
+	fmt.Println(result)
+	fmt.Println(request_log)
+
+	var res ResultSettle
+	res.ResultCode = "0"
+	res.DocId = "708275799870021632"
+	res.Amount = "1088.00"
+	//if err := json.Unmarshal([]byte(result), &res); err != nil {
+	//	utils.ErrorLog("解析失败：%v", err)
+	//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	//	return
+	//}
+	if res.ResultCode == "0" {
+		//allTotal := fmt.Sprintf("%.4f", total)
+		totals, _ := strconv.ParseFloat(res.Amount, 64)
+		order := &models.HisOrder{
+			PsnNo:              his.PsnNo,
+			UserOrgId:          org_id,
+			HisPatientId:       his.ID,
+			PatientId:          id,
+			SettleAccountsDate: recordDateTime,
+			Ctime:              time.Now().Unix(),
+			Mtime:              time.Now().Unix(),
+			Status:             1,
+			OrderStatus:        1,
+			MdtrtId:            his.Number,
+			Number:             chrg_bchno,
+			SetlId:             res.DocId,
+			MedfeeSumamt:       totals,
+			MedType:            strconv.Itoa(int(reg_type)),
+			SettleEndTime:      end_time,
+			SettleStartTime:    start_time,
+			SettleType:         settle_accounts_type,
+			FaPiaoCode:         fapiao_code,
+			FaPiaoNumber:       fapiao_number,
+			Diagnosis:          diagnosis_id,
+			PType:              2,
+			SetlTime:           tm.Format("2006-01-02 15:04:05"),
+		}
+		err = service.CreateOrder(order)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateOrderException)
+			return
+		}
+
+		for _, item := range customs {
+			var advice_id int64 = 0
+			var project_id int64 = 0
+			var item_id int64 = 0
+
+			var types int64 = 0
+
+			if item.Type == 1 {
+				advice_id = item.AdviceId
+				project_id = 0
+				item_id = 0
+			} else if item.Type == 2 {
+				advice_id = 0
+				item_id = 0
+
+				project_id = item.ProjectId
+			} else if item.Type == 3 {
+				advice_id = 0
+				item_id = item.ItemId
+				project_id = 0
+			}
+			detItemFeeSumamt, _ := strconv.ParseFloat(item.DetItemFeeSumamt, 32)
+			cut, _ := strconv.ParseFloat(item.Cut, 32)
+			pric, _ := strconv.ParseFloat(item.Price, 32)
+			info := &models.HisOrderInfo{
+				OrderNumber:      order.Number,
+				UploadDate:       time.Now().Unix(),
+				AdviceId:         advice_id,
+				DetItemFeeSumamt: detItemFeeSumamt,
+				Cnt:              cut,
+				Pric:             pric,
+				PatientId:        id,
+				Status:           1,
+				Mtime:            time.Now().Unix(),
+				Ctime:            time.Now().Unix(),
+				UserOrgId:        org_id,
+				HisPatientId:     his.ID,
+				OrderId:          order.ID,
+				ProjectId:        project_id,
+				Type:             types,
+				ItemId:           item_id,
+			}
+			service.CreateOrderInfo(info)
+		}
+		his.Diagnosis = diagnosis_id
+		his.SickType = sick_type
+		his.RegisterType = reg_type
+		his.MedicalTreatmentType = reg_type
+		service.UpdataHisPateint(&his)
+		err = service.UpDatePrescriptionNumber(org_id, ids, chrg_bchno)
+		err = service.UpDateHisPrescriptionInfoNumber(org_id, id, chrg_bchno, recordDateTime, his_patient_id)
+		err = service.UpdataOrderStatusThree(chrg_bchno, org_id)
+		if err == nil {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg": "记账成功",
+			})
+		}
+	}
+
+}
+
+func (c *CoordinateController) OpCancelKeepAccounts() {
+	order_id, _ := c.GetInt64("order_id")
+	admin_user_id, _ := c.GetInt64("admin_user_id")
+	org_id, _ := c.GetInt64("org_id")
+	org_id = 4
+	order, _ := service.GetHisOrderByID(order_id)
+	if order.ID == 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOrderParamWrong)
+		return
+	}
+
+	role, _ := service.GetAdminUserInfoByID(org_id, admin_user_id)
+	result, request_log := service.OpCancelKeepAccounts(order.SetlId, role.UserName, role.DoctorNumber)
+
+	var res RefundDetail
+	if err := json.Unmarshal([]byte(result), &res); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	fmt.Println(result)
+	fmt.Println(request_log)
+	fmt.Println(res)
+	flag := 0
+	isSuccess := false
+	for _, item := range res.Result {
+		if item.Code == "200" {
+			flag = flag + 1
+		}
+	}
+	if len(res.Result) == flag {
+		isSuccess = true
+	}
+
+	if isSuccess {
+		err := service.UpdataOrderStatus(order_id, order.Number, org_id)
+		if err == nil {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg": "撤销记账成功",
+			})
+		} else {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+}
+
+//func saveLog(result string, request string, infno string, desc string) {
+//
+//	org_id, _ := beego.AppConfig.Int64("org_id")
+//	miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
+//	dir := miConfig.OrgName + "日志"
+//	utils.Mkdir(dir)
+//	month := time.Unix(1557042972, 0).Format("1")
+//	year := time.Now().Format("2006")
+//	month = time.Now().Format("01")
+//	day := time.Now().Format("02")
+//	hour := time.Now().Format("15")
+//	min := time.Now().Format("04")
+//	sec := time.Now().Format("05")
+//
+//	result_time := year + "-" + month + "-" + day + " " + hour + ":" + min + ":" + sec
+//
+//	file := strconv.FormatInt(org_id, 10) + "_" + year + month + day + "_log"
+//	file_name := file + ".txt"
+//	file_path := miConfig.OrgName + "日志" + "/" + file_name
+//	exist, _ := utils.PathExists(file_path)
+//	if exist { //存在
+//		fmt.Println("存在")
+//		f, err := os.OpenFile(file_path, os.O_WRONLY, 0644)
+//		if err != nil {
+//			fmt.Println("read fail")
+//		}
+//		content := "\r\n" + "\r\n" + "\r\n" + result_time + " " + "【 " + desc + infno + "入参" + " 】：" + "\r\n" + request + "\r\n" + result_time + " " + "【 " + desc + infno + "出参" + " 】：" + "\r\n" + result
+//		n, _ := f.Seek(0, 2)
+//		_, err = f.WriteAt([]byte(content), n)
+//
+//	} else { //不存在
+//		fmt.Println("文件不存在，创建文件")
+//		f, err := os.Create(miConfig.OrgName + "日志" + "/" + file_name)
+//		defer f.Close()
+//		if err != nil {
+//		} else {
+//			_, err = f.Write([]byte("记录日志"))
+//		}
+//	}
+//
+//}
+
+type Charset string
+
+const (
+	UTF8    = Charset("UTF-8")
+	GB18030 = Charset("GB18030")
+)

controllers/gobal_config_api_controller.go

@@ -1089,12 +1089,17 @@ func (c *GobalConfigApiController) GetOrgs() {
 		}
 	}
 	orgs = RemoveRepeatedOrgElement(orgs)
+	fmt.Println("~~~~")
+	role, _ := service.GetAdminUserInfoByID(orgId, id)
+	miConfig, _ := service.FindMedicalInsuranceInfo(orgId)
 
 	c.ServeSuccessJSON(map[string]interface{}{
-		"orgs":      orgs,
-		"adminUser": adminUser,
-		"creator":   creator,
-		"admin":     admin,
+		"orgs":       orgs,
+		"adminUser":  adminUser,
+		"creator":    creator,
+		"admin":      admin,
+		"role":       role,
+		"org_config": miConfig,
 	})
 
 }

controllers/his_charge_api_controller.go

@@ -17,6 +17,9 @@ func HisChargeApiRegistRouters() {
 	beego.Router("/api/his/chargestatistics/detail", &HisChargeApiController{}, "get:GetChargeStatisticsDetail")
 	beego.Router("/api/his/chargestatistics/settle", &HisChargeApiController{}, "get:GetChargeStatisticsSettle")
 
+	beego.Router("/api/his/patient", &HisChargeApiController{}, "get:GetAllPatient")
+	//beego.Router("/api/his/chargestatistics/settle", &HisChargeApiController{}, "get:GetChargeStatisticsSettle")
+
 	beego.Router("/api/his/inspectionlist/get", &HisChargeApiController{}, "get:GetHisInspectionList")
 	beego.Router("/api/his/inspectioninfo/get", &HisChargeApiController{}, "get:GetHisInspectionInfo")
 
@@ -316,3 +319,90 @@ func (c *HisChargeApiController) GetHisYidiClearRecord() {
 		return
 	}
 }
+
+func (c *HisChargeApiController) GetAllPatient() {
+	patients, err := service.GetAllPatientTwo(c.GetAdminUserInfo().CurrentOrgId)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"list": patients,
+		})
+		return
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+}
+
+func (c *HisChargeApiController) GetStatisticsDetail() {
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+	keyword := c.GetString("keyword")
+	item_type, _ := c.GetInt64("type")
+	p_type, _ := c.GetInt64("p_type")
+	patinet_id, _ := c.GetInt64("patinet_id")
+
+	adminUser := c.GetAdminUserInfo()
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	startTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+	if err != nil {
+
+	}
+	startRecordDateTime := startTime.Unix()
+
+	endTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+	if err != nil {
+
+	}
+	endRecordDateTime := endTime.Unix()
+
+	chargePatient, err := service.GetPatientChargeDetails(patinet_id, adminUser.CurrentOrgId, startRecordDateTime, endRecordDateTime, keyword, item_type, p_type)
+
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"patients": chargePatient,
+		})
+		return
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+
+	}
+
+}
+
+func (c *HisChargeApiController) GetStatisticsGather() {
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+	keyword := c.GetString("keyword")
+	item_type, _ := c.GetInt64("type")
+	adminUser := c.GetAdminUserInfo()
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	startTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+	if err != nil {
+
+	}
+	startRecordDateTime := startTime.Unix()
+
+	endTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+	if err != nil {
+
+	}
+	endRecordDateTime := endTime.Unix()
+
+	chargePatient, err := service.GetAllPatientChargeDetails(adminUser.CurrentOrgId, startRecordDateTime, endRecordDateTime, keyword, item_type)
+
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"patients": chargePatient,
+		})
+		return
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+
+	}
+
+}

controllers/his_hospital_api_controller.go

@@ -6,6 +6,7 @@ import (
 	"XT_New/service"
 	"fmt"
 	"github.com/astaxie/beego"
+	"github.com/shopspring/decimal"
 	"math/rand"
 	"strconv"
 	"strings"
@@ -29,6 +30,7 @@ func HisHospitalManagerApiRegistRouters() {
 	beego.Router("/api/hospital/outhopitaluncheck/get", &HisHospitalApiController{}, "get:GetZHOutHospitalUnCheck")
 	beego.Router("/api/hospital/refund", &HisHospitalApiController{}, "get:ZHRefund")
 	beego.Router("/api/hospital/upload", &HisHospitalApiController{}, "get:GetUploadInfo")
+	beego.Router("/api/hospital/refunddetail", &HisHospitalApiController{}, "get:RefundDetail")
 
 	beego.Router("/api/hospitaldetail/list", &HisHospitalApiController{}, "get:GetHisHospitalDetailPatientList")
 	beego.Router("/api/hospitaldetail/info", &HisHospitalApiController{}, "get:GetHisHospitalDetailInfo")
@@ -36,6 +38,55 @@ func HisHospitalManagerApiRegistRouters() {
 	beego.Router("/api/monthhospitaldetail/get", &HisHospitalApiController{}, "get:GetHisHospitalMonthDetailInfo")
 
 }
+func (c *HisHospitalApiController) RefundDetail() {
+	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")
+	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()
+	theTimeTwo, err := time.ParseInLocation(timeLayout+" 15:04:05", record_time+" 23:59:59", loc)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	recordDateTimeTwo := theTimeTwo.Unix()
+	if settle_accounts_type == 1 { //日结
+		err := service.UpDateOrderInfoStatus(patient_id, recordDateTime, adminUser.CurrentOrgId, recordDateTimeTwo)
+
+		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": "撤销明细成功",
+		})
+
+	} else {
+		record, _ := service.GetInHospitalRecord(his_patient_id)
+		err := service.UpdataHospitalOrderStatusTwo(record.Number, adminUser.CurrentOrgId)
+		if err == nil {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg": "撤销明细成功",
+			})
+		} else {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+	}
+}
 
 func (c *HisHospitalApiController) GetUploadInfo() {
 	id, _ := c.GetInt64("id")
@@ -453,17 +504,36 @@ func (c *HisHospitalApiController) GetHisHospitalChargePatientInfo() {
 	}
 
 	if order_status == 1 || order_status == 0 {
-		settle_prescriptions, _ = service.GetSettleHisHospitalPrescription(admin.CurrentOrgId, patient_id, his_patient_id, his_patient_info.RecordDate)
+		settle_prescriptions, _ = service.GetSettleHisHospitalPrescription(admin.CurrentOrgId, patient_id, his_patient_info.Number)
 	} else if order_status == 2 {
 		settle_prescriptions, _ = service.GetSettleHisHospitalPrescriptionTwo(admin.CurrentOrgId, patient_id, his_patient_info.Number)
 	}
+
+	var settle_total float64
+	for _, item := range settle_prescriptions {
+		if len(item.HisPrescriptionProject) > 0 {
+			for _, subItem := range item.HisPrescriptionProject {
+				count, _ := strconv.ParseFloat(subItem.Count, 64)
+				total, _ := decimal.NewFromFloat(count * subItem.Price).Round(2).Float64()
+				settle_total = settle_total + total
+			}
+		}
+		if len(item.HisDoctorAdviceInfo) > 0 {
+			for _, subItem := range item.HisDoctorAdviceInfo {
+				total, _ := decimal.NewFromFloat(subItem.PrescribingNumber * subItem.Price).Round(2).Float64()
+				settle_total = settle_total + total
+			}
+		}
+
+	}
+	settle_total, _ = decimal.NewFromFloat(settle_total).Round(2).Float64()
+
 	case_history, _ := service.GetHisPatientCaseHistoryInfo(admin.CurrentOrgId, patient_id, recordDateTime)
 	patientPrescriptionInfo, _ := service.FindPatientPrescriptionInfoTwo(admin.CurrentOrgId, patient_id, recordDateTime, p_type)
 	order, _ := service.GetNewHisOrder(admin.CurrentOrgId, his_patient_info.Number, patient_id)
 	doctors, _ := service.GetHisAdminUserDoctors(admin.CurrentOrgId)
 	//获取所有科室信息
 	department, _ := service.GetAllDepartMent(admin.CurrentOrgId)
-
 	c.ServeSuccessJSON(map[string]interface{}{
 		"his_info":             his_patient_info,
 		"xt_info":              xt_patient_info,
@@ -475,6 +545,7 @@ func (c *HisHospitalApiController) GetHisHospitalChargePatientInfo() {
 		"doctors":              doctors,
 		"department":           department,
 		"settle_prescriptions": settle_prescriptions,
+		"settle_total":         settle_total,
 	})
 	return
 
@@ -622,7 +693,8 @@ func (c *HisHospitalApiController) GetZHInHospitalCheck() {
 }
 func (this *HisHospitalApiController) GetZHOutHospitalCheck() {
 	id, _ := this.GetInt64("id")
-	record_date := this.GetString("record_date")
+	record_time := this.GetString("record_time")
+	out_time := this.GetString("out_time")
 
 	record, _ := service.GetInHospitalRecord(id)
 	if record.ID == 0 {
@@ -632,15 +704,15 @@ func (this *HisHospitalApiController) GetZHOutHospitalCheck() {
 
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
-	theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+	theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_time+" 00:00:00", loc)
 
 	recordDateTime := theTime.Unix()
 
-	timestamp := time.Now().Unix()
-	tempTime := time.Unix(timestamp, 0)
-	timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
+	//timestamp := time.Now().Unix()
+	//tempTime := time.Unix(timestamp, 0)
+	//timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
 	record.OutHospitalStatus = 1
-	record.OutHosptialTime = timeFormatOne
+	record.OutHosptialTime = out_time
 	record.OutWay = 1
 	service.CreateHospitalRecord(&record)
 

controllers/his_print_api_controller.go

@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"XT_New/enums"
+	"XT_New/models"
 	"XT_New/service"
 	"github.com/astaxie/beego"
 	"strings"
@@ -38,25 +39,49 @@ func (c *HisPrintApiController) GetBatchHisPrescriptionData() {
 		})
 		break
 	case 2:
-		patients, _ := service.GetBatchProjectHisPrescription(ids, recordDateTime, adminInfo.CurrentOrgId)
-		for _, item := range patients {
-			for _, subItem := range item.HisPrintPrescription {
-				for _, subItemTwo := range subItem.HisPrescriptionProject {
-					if subItemTwo.HisProject.CostClassify == 3 {
-
-					}
-				}
-			}
-		}
+		//var newPatients []*models.PrintPatient
 
+		patients, _ := service.GetBatchProjectHisPrescription(ids, recordDateTime, adminInfo.CurrentOrgId)
+		//for _, item := range patients {
+		//	for _, subItem := range item.HisPrintPrescription {
+		//		for _, subItemTwo := range subItem.HisPrescriptionProject {
+		//			if subItemTwo.HisProject.CostClassify != 3 {
+		//
+		//			}
+		//		}
+		//	}
+		//}
 		c.ServeSuccessJSON(map[string]interface{}{
 			"patients": patients,
 		})
 		break
 	case 3:
+		var newPatients []*models.PrintPatient
+		var newPatientsTwo []*models.PrintPatient
+
 		patients, _ := service.GetBatchInspectionProjectHisPrescription(ids, recordDateTime, adminInfo.CurrentOrgId)
+		for _, item := range patients {
+			var newPatient *models.PrintPatient
+			newPatient = item
+			for index, subItem := range item.HisPrintPrescription {
+				if index > 0 {
+					item.HisPrintPrescription[0].HisPrescriptionProject = append(item.HisPrintPrescription[0].HisPrescriptionProject, subItem.HisPrescriptionProject...)
+				}
+			}
+			newPatients = append(newPatients, newPatient)
+		}
+
+		for _, item := range patients {
+			var newPatient *models.PrintPatient
+			newPatient = item
+			if len(item.HisPrintPrescription) > 0 {
+				newPatient.NewHisPrintPrescription = append(newPatient.NewHisPrintPrescription, item.HisPrintPrescription[0])
+				newPatientsTwo = append(newPatientsTwo, newPatient)
+			}
+		}
+
 		c.ServeSuccessJSON(map[string]interface{}{
-			"patients": patients,
+			"patients": newPatientsTwo,
 		})
 		break
 	}

controllers/his_project_api_controller.go

@@ -1201,6 +1201,8 @@ func (this *HisProjectApiController) GetHisPatient() {
 func (this *HisProjectApiController) GetDoctorAdvicePrint() {
 
 	patient_id, _ := this.GetInt64("patient_id")
+	his_patient_id, _ := this.GetInt64("his_patient_id")
+
 	record_date := this.GetString("record_date")
 	schIDStr := this.GetString("ids")
 	p_type, _ := this.GetInt64("p_type")
@@ -1230,7 +1232,7 @@ func (this *HisProjectApiController) GetDoctorAdvicePrint() {
 	his, _ := service.GetLastHisPatient(patient_id, adminUserInfo.CurrentOrgId)
 	prescriptionInfo, _ := service.GetPrscriptionInfo(patient_id, recordDateTime)
 	//advicePrint, err := service.GetPre(patient_id, recordDateTime, idStrs, adminUserInfo.CurrentOrgId, temp_p_type)
-	hisPatient, _ := service.GetHisPatientInfo(adminUserInfo.CurrentOrgId, patient_id, recordDateTime)
+	hisPatient, _ := service.GetHisPatientInfoFour(adminUserInfo.CurrentOrgId, patient_id, recordDateTime, his_patient_id)
 	//hisPatient, _ := service.GetHisPatientById(patient_id)
 	hisHospitalRecord, _ := service.GetLastHospitalRecordTwo(patient_id, adminUserInfo.CurrentOrgId)
 
@@ -1553,14 +1555,10 @@ func (this *HisProjectApiController) GetTodaySchedulePatient() {
 func (this *HisProjectApiController) GetHisPatientDetail() {
 	patient_id, _ := this.GetInt64("patient_id")
 
-	hisPatient, err := service.GetHisPatientById(patient_id)
+	hisPatient, _ := service.GetHisPatientByIdFour(patient_id)
 	//service.GetLastHospitalRecordTwo(patient_id,this.GetAdminUserInfo().CurrentOrgId)
 	hisHospitalRecord, _ := service.GetLastHospitalRecordTwo(patient_id, this.GetAdminUserInfo().CurrentOrgId)
 
-	if err != nil {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
-		return
-	}
 	this.ServeSuccessJSON(map[string]interface{}{
 		"hisPatient":        hisPatient,
 		"hisHospitalRecord": hisHospitalRecord,

models/his_charge_models.go

@@ -241,3 +241,54 @@ type GdybPsnNcdsRecord struct {
 func (GdybPsnNcdsRecord) TableName() string {
 	return "gdyb_psn_ncds_record"
 }
+
+type ChargePatientTwo 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"`
+	Name      string `gorm:"column:name" json:"name" form:"name"`
+	Lapseto   int64  `gorm:"column:lapseto" json:"lapseto" form:"lapseto"`
+	Status    int64  `gorm:"column:status" json:"status" form:"status"`
+}
+
+func (ChargePatientTwo) TableName() string {
+	return "xt_patients"
+}
+
+type HisChargeOrderTwo 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"`
+	Status                int64                    `gorm:"column:status" json:"status" form:"status"`
+	Number                string                   `gorm:"column:number" json:"number" form:"number"`
+	OrderStatus           int64                    `gorm:"column:order_status" json:"order_status" form:"order_status"`
+	MdtrtId               string                   `gorm:"column:mdtrt_id" json:"mdtrt_id" form:"mdtrt_id"`
+	PatientId             int64                    `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HisChargeOrderInfoTwo []*HisChargeOrderInfoTwo `gorm:"ForeignKey:OrderNumber;AssociationForeignKey:Number" json:"order_info"`
+}
+
+func (HisChargeOrderTwo) TableName() string {
+	return "his_order"
+}
+
+type HisChargeOrderInfoTwo struct {
+	ID                           int64                        `gorm:"column:id" json:"id" form:"id"`
+	OrderNumber                  string                       `gorm:"column:order_number" json:"order_number" form:"order_number"`
+	AdviceId                     int64                        `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
+	DetItemFeeSumamt             float64                      `gorm:"column:det_item_fee_sumamt" json:"det_item_fee_sumamt" form:"det_item_fee_sumamt"`
+	Cnt                          float64                      `gorm:"column:cnt" json:"cnt" form:"cnt"`
+	Pric                         float64                      `gorm:"column:pric" json:"pric" form:"pric"`
+	MedChrgitmType               string                       `gorm:"column:med_chrgitm_type" json:"med_chrgitm_type" form:"med_chrgitm_type"`
+	Status                       int64                        `gorm:"column:status" json:"status" form:"status"`
+	ChldMedcFlag                 string                       `gorm:"column:chld_medc_flag" json:"chld_medc_flag" form:"chld_medc_flag"`
+	ChrgitmLv                    string                       `gorm:"column:chrgitm_lv" json:"chrgitm_lv" form:"chrgitm_lv"`
+	UserOrgId                    int64                        `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	ProjectId                    int64                        `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	Type                         int64                        `gorm:"column:type" json:"type" form:"type"`
+	HisChargePrescriptionProject HisChargePrescriptionProject `gorm:"ForeignKey:ID;AssociationForeignKey:ProjectId" json:"project"`
+	HisChargeDoctorAdviceInfo    HisChargeDoctorAdviceInfo    `gorm:"ForeignKey:AdviceId;AssociationForeignKey:ID" json:"advice"`
+}
+
+func (HisChargeOrderInfoTwo) TableName() string {
+	return "his_order_info"
+}

models/his_hospital_models.go

@@ -83,6 +83,54 @@ func (HisHospitalCheckRecord) TableName() string {
 	return "his_hospital_check_record"
 }
 
+type HisHospitalCheckRecordTwo struct {
+	ID                   int64  `gorm:"column:id" json:"id" form:"id"`
+	Name                 string `gorm:"column:name" json:"name" form:"name"`
+	MedicalTreatmentType int64  `gorm:"column:medical_treatment_type" json:"medical_treatment_type" form:"medical_treatment_type"`
+	RecordDate           int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	IdCardNo             string `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
+	AdminUserId          int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	Departments          int64  `gorm:"column:departments" json:"departments" form:"departments"`
+	UserOrgId            int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status               int64  `gorm:"column:status" json:"status" form:"status"`
+	Ctime                int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	PatientId            int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Number               string `gorm:"column:number" json:"number" form:"number"`
+	Doctor               int64  `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	PsnNo                string `gorm:"column:psn_no" json:"psn_no" form:"psn_no"`
+	PsnCertType          string `gorm:"column:psn_cert_type" json:"psn_cert_type" form:"psn_cert_type"`
+	Certno               string `gorm:"column:certno" json:"certno" form:"certno"`
+	PsnName              string `gorm:"column:psn_name" json:"psn_name" form:"psn_name"`
+	Gend                 string `gorm:"column:gend" json:"gend" form:"gend"`
+	Naty                 string `gorm:"column:naty" json:"naty" form:"naty"`
+	MedType              int64  `gorm:"column:med_type" json:"med_type" form:"med_type"`
+	Brdy                 string `gorm:"column:brdy" json:"brdy" form:"brdy"`
+	Iinfo                string `gorm:"column:iinfo" json:"iinfo" form:"iinfo"`
+	Idetinfo             string `gorm:"column:idetinfo" json:"idetinfo" form:"idetinfo"`
+	IptOtpNo             string `gorm:"column:ipt_otp_no" json:"ipt_otp_no" form:"ipt_otp_no"`
+	AdmBed               int64  `gorm:"column:adm_bed" json:"adm_bed" form:"adm_bed"`
+	IdCardType           int64  `gorm:"column:id_card_type" json:"id_card_type" form:"id_card_type"`
+	Diagnosis            string `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	InsutypeType         string `gorm:"column:insutype_type" json:"insutype_type" form:"insutype_type"`
+	SickType             int64  `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
+	MdtrtCertType        string `gorm:"column:mdtrt_cert_type" json:"mdtrt_cert_type" form:"mdtrt_cert_type"`
+	InHosptialTime       string `gorm:"column:in_hosptial_time" json:"in_hosptial_time" form:"in_hosptial_time"`
+	OutHosptialTime      string `gorm:"column:out_hosptial_time" json:"out_hosptial_time" form:"out_hosptial_time"`
+	InHospitalStatus     int64  `gorm:"column:in_hospital_status" json:"in_hospital_status" form:"in_hospital_status"`
+	Certificates         int64  `gorm:"column:certificates" json:"certificates" form:"certificates"`
+	OutHospitalStatus    int64  `gorm:"column:out_hospital_status" json:"out_hospital_status" form:"out_hospital_status"`
+	OutWay               int64  `gorm:"column:out_way" json:"out_way" form:"out_way"`
+	Phone                string `gorm:"column:phone" json:"phone" form:"phone"`
+	BalanceAccountsType  int64  `gorm:"column:balance_accounts_type" json:"balance_accounts_type" form:"balance_accounts_type"`
+	PsnType              int64  `gorm:"column:psn_type" json:"psn_type" form:"psn_type"`
+	InsuplcAdmdvs        string `gorm:"column:insuplc_admdvs" json:"insuplc_admdvs" form:"insuplc_admdvs"`
+}
+
+func (HisHospitalCheckRecordTwo) TableName() string {
+	return "his_hospital_check_record"
+}
+
 type NewCustom struct {
 	DetItemFeeSumamt float64
 	Cut              float64

models/his_models.go

@@ -519,7 +519,6 @@ type HisPrescription struct {
 	HisPrescriptionProject []*HisPrescriptionProject `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"project"`
 	HisAdditionalCharge    []*HisAdditionalCharge    `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"addition"`
 	HisPrescriptionInfo    HisPrescriptionInfo       `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:PatientId,RecordDate" json:"info"`
-	HisOrder               HisOrder                  `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"addition"`
 	Total                  string                    `gorm:"-" json:"total" form:"total"`
 	PType                  int64                     `gorm:"column:p_type" json:"p_type" form:"p_type"`
 	MedType                string                    `gorm:"column:med_type" json:"med_type" form:"med_type"`
@@ -735,7 +734,7 @@ type HisDoctorAdviceTemplate struct {
 	UpdatedTime           int64   `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
 	TemplateId            int64   `gorm:"column:template_id" json:"template_id" form:"template_id"`
 	DrugSpec              string  `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
-	DrugSpecUnit          string  `gorm:"column:drug_spec_unit" json:"drug_spec_unit" form:"drug_spec_unit"`
+	DrugSpecUnit          string  `gorm:"column:drug_spec_unit" json:"drug_spechis_unit" form:"drug_spec_unit"`
 	ParentId              int64   `gorm:"column:parent_id" json:"parent_id" form:"parent_id"`
 	AdviceType            int64   `gorm:"column:advice_type" json:"advice_type" form:"advice_type"`
 	DayCount              int64   `gorm:"column:day_count" json:"day_count" form:"day_count"`
@@ -1970,3 +1969,27 @@ type HisPrescriptionProjectTwo struct {
 func (HisPrescriptionProjectTwo) TableName() string {
 	return "his_prescription_project"
 }
+
+type Reg struct {
+	DeptId      string
+	PatientId   string
+	PatientName string
+	DoctorId    string
+	RegDate     string
+	RegFee      string
+	TreatFee    string
+	OperatorId  string
+	IdCardNo    string
+}
+
+type NewCustomTwo struct {
+	DetItemFeeSumamt string
+	Cut              string
+	FeedetlSn        string
+	Price            string
+	MedListCodg      string
+	Type             int64
+	AdviceId         int64
+	ProjectId        int64
+	ItemId           int64
+}

models/his_print_models.go

@@ -1,19 +1,20 @@
 package models
 
 type PrintPatient 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"`
-	Name                   string                  `gorm:"column:name" json:"name" form:"name"`
-	Age                    string                  `gorm:"column:age" json:"age" form:"age"`
-	Gender                 int64                   `gorm:"column:gender" json:"gender" form:"gender"`
-	HomeAddress            string                  `gorm:"column:home_address" json:"home_address" form:"home_address"`
-	Phone                  string                  `gorm:"column:phone" json:"phone" form:"phone"`
-	Lapseto                int64                   `gorm:"column:lapseto" json:"lapseto" form:"lapseto"`
-	Status                 int64                   `gorm:"column:status" json:"status" form:"status"`
-	HisPrintPatient        HisPrintPatient         `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"his_patient"`
-	HisHospitalCheckRecord HisHospitalCheckRecord  `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"his_record_patient"`
-	HisPrescriptionInfoTwo HisPrescriptionInfoTwo  `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"info"`
-	HisPrintPrescription   []*HisPrintPrescription `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"prescriptions"`
+	ID                      int64                   `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId               int64                   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Name                    string                  `gorm:"column:name" json:"name" form:"name"`
+	Age                     string                  `gorm:"column:age" json:"age" form:"age"`
+	Gender                  int64                   `gorm:"column:gender" json:"gender" form:"gender"`
+	HomeAddress             string                  `gorm:"column:home_address" json:"home_address" form:"home_address"`
+	Phone                   string                  `gorm:"column:phone" json:"phone" form:"phone"`
+	Lapseto                 int64                   `gorm:"column:lapseto" json:"lapseto" form:"lapseto"`
+	Status                  int64                   `gorm:"column:status" json:"status" form:"status"`
+	HisPrintPatient         HisPrintPatient         `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"his_patient"`
+	HisHospitalCheckRecord  HisHospitalCheckRecord  `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"his_record_patient"`
+	HisPrescriptionInfoTwo  HisPrescriptionInfoTwo  `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"info"`
+	HisPrintPrescription    []*HisPrintPrescription `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"prescriptions"`
+	NewHisPrintPrescription []*HisPrintPrescription `json:"new_prescriptions"`
 }
 
 func (PrintPatient) TableName() string {

models/patient_models.go

@@ -189,6 +189,7 @@ type Patients struct {
 	TrobleShoot              int64   `gorm:"column:troble_shoot" json:"troble_shoot" form:"troble_shoot"`
 	ContagionIds             []int64 `gorm:"-"`
 	DryWeight                float64 `gorm:"-"`
+	ZbPatientId              string  `gorm:"column:zb_patient_id" json:"zb_patient_id" form:"zb_patient_id"`
 }
 
 func (Patients) TableName() string {
@@ -540,6 +541,7 @@ type UserAdminRole struct {
 	Status          int64           `gorm:"column:status" json:"status"`
 	Ctime           int64           `gorm:"column:ctime" json:"ctime"`
 	Mtime           int64           `gorm:"column:mtime" json:"mtime"`
+	DoctorNumber    string          `gorm:"column:doctor_number" json:"doctor_number"`
 	Department      string          `gorm:"column:department" json:"department"`
 	DepartmentId    int64           `gorm:"column:department_id" json:"department_id"`
 	XtHisDepartment XtHisDepartment `json:"department" gorm:"foreignkey:DepartmentId;AssociationForeignKey:ID;"`

routers/router.go

@@ -57,6 +57,7 @@ func init() {
 	controllers.HisChargeApiRegistRouters()
 	controllers.HisHospitalManagerApiRegistRouters()
 	controllers.HisPrintApiRegistRouters()
+	controllers.CoordinateRegistRouters()
 
 	m_api.MobileAPIControllersRegisterRouters()
 	new_m_api.NewMobileAPIControllersRegisterRouters()

service/coordinate_service.go

@@ -0,0 +1,327 @@
+package service
+
+import (
+	"XT_New/models"
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"github.com/jinzhu/gorm"
+	"io/ioutil"
+	"net/http"
+)
+
+func SavePatientMessageInfo() (string, string) {
+
+	//input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputData["patType"] = "1"                  // 就诊凭证编号
+	inputData["patIdNo"] = "440510199211080033" // 开始时间
+	inputData["patName"] = "测试患者"               // 人员姓名
+
+	inputData["patMobile"] = "13535547902" // 人员姓名
+	inputData["patSex"] = "M"              // 人员姓名
+	inputData["patMarriage"] = "1"         // 人员姓名
+	inputData["birthday"] = "1992-10-23"   // 人员姓名
+	inputData["patAddress"] = "11111"      // 人员姓名
+	inputData["thirdPartyID"] = "6933"     // 人员姓名
+	inputData["patAge"] = "30"             // 人员姓名
+	//input["req"] = inputData
+
+	var inputLog string
+	bytesData, err := json.Marshal(inputData)
+	inputLog = string(bytesData)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	reader := bytes.NewReader(bytesData)
+	var url string
+	gdyb_url := "http://218.104.146.179:9091/esb/listener/savePatientMessageInfo"
+	url = gdyb_url
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
+	request, err := http.NewRequest("GET", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("code", "Xmrjyy")
+
+	client := http.Client{}
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	fmt.Println(string(respBytes))
+	str := string(respBytes)
+	return str, inputLog
+
+}
+
+func SaveReg(reg models.Reg) (string, string) {
+
+	//input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+
+	inputData["deptId"] = reg.DeptId
+	inputData["clinicUnitId"] = ""
+	inputData["healthCardNo"] = ""
+	fmt.Println(reg.PatientId)
+	inputData["patientId"] = reg.PatientId
+	inputData["patientName"] = reg.PatientName
+	inputData["idCardNo"] = reg.IdCardNo
+	inputData["phone"] = "13535547901"
+	inputData["doctorId"] = "1111"
+	inputData["doctorLevelCode"] = ""
+	inputData["regDate"] = reg.RegDate
+
+	inputData["shiftCode"] = ""
+	inputData["startTime"] = ""
+	inputData["endTime"] = ""
+
+	inputData["scheduleId"] = ""
+	inputData["periodId"] = ""
+
+	inputData["svObjectId"] = ""
+	inputData["diseaseId"] = ""
+	inputData["regFee"] = reg.RegFee
+
+	inputData["treatFee"] = reg.TreatFee
+	inputData["operatorId"] = reg.OperatorId
+	inputData["remark"] = "111111"
+
+	inputData["orderType"] = "0"
+	inputData["clinicCode"] = ""
+	inputData["infoSeq"] = ""
+
+	//input["Request"] = inputData
+
+	var inputLog string
+	bytesData, err := json.Marshal(inputData)
+	inputLog = string(bytesData)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	reader := bytes.NewReader(bytesData)
+	var url string
+	gdyb_url := "http://218.104.146.179:9091/esb/listener/saveReg"
+	url = gdyb_url
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("code", "Xmrjyy")
+
+	client := http.Client{}
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	fmt.Println(string(respBytes))
+	str := string(respBytes)
+	return str, inputLog
+
+}
+func GetWaitPayDetail() (string, string) {
+
+	//input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+
+	inputData["clinicSeq"] = "30445"              // 就诊凭证编号
+	inputData["prescriptionId"] = ""              // 开始时间
+	inputData["patientId"] = "701822660170096645" // 人员姓名
+
+	var inputLog string
+	bytesData, err := json.Marshal(inputData)
+	inputLog = string(bytesData)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	reader := bytes.NewReader(bytesData)
+	var url string
+	gdyb_url := "http://218.104.146.179:9091/esb/listener/getWaitPayDetail"
+	url = gdyb_url
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("code", "Xmrjyy")
+
+	client := http.Client{}
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	fmt.Println(string(respBytes))
+	str := string(respBytes)
+	return str, inputLog
+
+}
+func OpKeepAccounts(number string, cus []*models.NewCustomTwo) (string, string) {
+
+	inputData := make(map[string]interface{})
+	feedetail := make([]map[string]interface{}, 0)
+	for _, item := range cus {
+		feedetailInfo := make(map[string]interface{})
+		feedetailInfo["itemCode"] = item.MedListCodg
+		feedetailInfo["num"] = item.Cut
+		feedetail = append(feedetail, feedetailInfo)
+	}
+	inputData["item"] = feedetail
+	inputData["clinicSeq"] = number // 就诊凭证编号
+	var inputLog string
+	bytesData, err := json.Marshal(inputData)
+	inputLog = string(bytesData)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	reader := bytes.NewReader(bytesData)
+	var url string
+	gdyb_url := "http://218.104.146.179:9091/esb/listener/opKeepAccounts"
+	url = gdyb_url
+
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("code", "Xmrjyy")
+
+	client := http.Client{}
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	fmt.Println(string(respBytes))
+	str := string(respBytes)
+	return str, inputLog
+
+}
+func OpCancelKeepAccounts(setl_id string, op_name string, op_code string) (string, string) {
+	inputData := make(map[string]interface{})
+	inputData["docId"] = setl_id
+	inputData["operCode"] = "111"
+	inputData["operName"] = "2222"
+	var inputLog string
+	bytesData, err := json.Marshal(inputData)
+	inputLog = string(bytesData)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	reader := bytes.NewReader(bytesData)
+	var url string
+	gdyb_url := "http://218.104.146.179:9091/esb/listener/opCancelKeepAccounts"
+	url = gdyb_url
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("code", "Xmrjyy")
+	client := http.Client{}
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	fmt.Println(string(respBytes))
+	str := string(respBytes)
+	return str, inputLog
+
+}
+
+func UpdateHisPatientStatus(his *models.VMHisPatient) {
+	writeDb.Save(&his)
+}
+
+func GetUnSettleHisPrescriptionFive(org_id int64, patient_id int64, record_date int64, p_type 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("HisOrderInfo", "status = 1").Preload("Drug", "status=1")
+		}).
+		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisOrderInfo", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1").Preload("XtHisProjectTeam", "status = 1")
+		}).Preload("TempHisOrder", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1 AND user_org_id = ? AND order_status <> 3  AND order_status <> 2  ", org_id)
+	}).
+		Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND order_status <> 2 AND order_status <> 3 and order_status <> 5  AND p_type = ?", org_id, record_date, patient_id, p_type).
+		Find(&prescription).Error
+	return
+}
+
+func GetUnSettleMonthHisPrescription(org_id int64, patient_id int64, start_date int64, end_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("Drug", "status=1")
+		}).
+		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject").Preload("GoodInfo", "status=1").Preload("XtHisProjectTeam", "status = 1")
+		}).
+		Where("user_org_id = ? AND status = 1 AND record_date >= ? AND record_date <= ? AND patient_id = ? AND order_status <> 2 AND order_status <> 5 AND p_type <> 1", org_id, start_date, end_date, patient_id).
+		Find(&prescription).Error
+	return
+}
+
+func GetHisOrderFour(patient_id string, infoSeq string, docId string) (order models.HisOrder, err error) {
+	err = readDb.Model(&models.HisOrder{}).Where("mdtrt_id = ? AND psn_no = ? AND setl_id = ?", infoSeq, patient_id, docId).First(&order).Error
+	return
+}

service/his_charge_service.go

@@ -311,3 +311,228 @@ func GetHisYidiClearRecordById(org_id int64, id int64) (record models.HisYidiCle
 	err = readDb.Model(&models.HisYidiClearRecord{}).Where("user_org_id = ? AND status = 1 AND id = ?", org_id, id).First(&record).Error
 	return
 }
+
+func GetAllPatientTwo(org_id int64) (patients []*models.ChargePatientTwo, err error) {
+	err = readDb.Model(&models.ChargePatientTwo{}).Where("user_org_id = ? AND status = 1", org_id).Find(&patients).Error
+	return
+}
+
+func GetPatientChargeDetails(patient_id int64, org_id int64, start_time int64, end_time int64, keyword string, item_type int64, settle_type int64) (patients []*models.HisChargeOrderTwo, err error) {
+	if len(keyword) == 0 {
+		switch item_type {
+		case 0:
+			readDb2.Model(&models.HisChargeOrderTwo{}).Joins("join his_patient his on his.number = his_order.mdtrt_id AND his.patient_id = ").Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
+				return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").
+					Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+						return db.Preload("Drug", "status = 1").Where("status = 1")
+					}).Preload("HisChargePrescriptionProject", func(db *gorm.DB) *gorm.DB {
+					return db.Select("id,project_id,user_org_id,status,patient_id,record_date,count,type").Preload("HisChargeProject", func(db *gorm.DB) *gorm.DB {
+						return db.Select("id,project_name,unit").Where("status = 1 ")
+					}).Preload("HisChargeGoodInfo", func(db *gorm.DB) *gorm.DB {
+						return db.Select("id,good_name,good_unit,specification_name").Where("status = 1 ")
+					}).Where("status = 1 ")
+				})
+			}).Where("status = 1  AND settle_accounts_date >= ? AND settle_accounts_date <= ? AND user_org_id = ? AND order_status = 2 AND patient_id = ? AND p_type=?", start_time, end_time, org_id, patient_id, settle_type)
+			break
+		case 1:
+			readDb2.Model(&models.HisChargeOrderTwo{}).Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
+				return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").
+					Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+						return db.Preload("Drug", "status = 1").Where("status = 1")
+					}).Where("status = 1 AND advice_id > 0 AND project_id = 0")
+			}).Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2  AND patient_id = ? AND p_type=?", start_time, end_time, org_id, patient_id, settle_type)
+
+			break
+		case 2:
+			readDb2.Model(&models.HisChargeOrderTwo{}).Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
+				return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").
+					Preload("HisChargePrescriptionProject", func(db *gorm.DB) *gorm.DB {
+						return db.Select("id,project_id,user_org_id,status,patient_id,record_date,count,type").Preload("HisChargeProject", func(db *gorm.DB) *gorm.DB {
+							return db.Select("id,project_name,unit").Where("status = 1 ")
+						}).Preload("HisChargeGoodInfo", func(db *gorm.DB) *gorm.DB {
+							return db.Select("id,good_name,good_unit,specification_name").Where("status = 1 ")
+						}).Where("status = 1 AND advice_id = 0 AND project_id > 0 ")
+					})
+			}).Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2 AND patient_id = ? AND p_type = ?", start_time, end_time, org_id, patient_id, settle_type)
+
+			break
+		case 3:
+			readDb2.Model(&models.HisChargeOrderTwo{}).Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
+				return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").
+					Preload("HisChargePrescriptionProject", func(db *gorm.DB) *gorm.DB {
+						return db.Select("id,project_id,user_org_id,status,patient_id,record_date,count,type").Preload("HisChargeProject", func(db *gorm.DB) *gorm.DB {
+							return db.Select("id,project_name,unit").Where("status = 1 ")
+						}).Preload("HisChargeGoodInfo", func(db *gorm.DB) *gorm.DB {
+							return db.Select("id,good_name,good_unit,specification_name").Where("status = 1 ")
+						}).Where("status = 1 AND advice_id = 0 AND project_id > 0 ")
+					})
+			}).Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2 AND patient_id = ? AND p_type = ?", start_time, end_time, org_id, patient_id, settle_type)
+			break
+		}
+
+	} else {
+		//keyword := "%" + keyword + "%"
+		switch item_type {
+		case 0:
+			readDb2.Model(&models.HisChargeOrderTwo{}).Joins("join his_patient his on his.number = his_order.mdtrt_id AND his.patient_id = ").Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
+				return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").
+					Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+						return db.Preload("Drug", "status = 1").Where("status = 1")
+					}).Preload("HisChargePrescriptionProject", func(db *gorm.DB) *gorm.DB {
+					return db.Select("id,project_id,user_org_id,status,patient_id,record_date,count,type").Preload("HisChargeProject", func(db *gorm.DB) *gorm.DB {
+						return db.Select("id,project_name,unit").Where("status = 1 ")
+					}).Preload("HisChargeGoodInfo", func(db *gorm.DB) *gorm.DB {
+						return db.Select("id,good_name,good_unit,specification_name").Where("status = 1 ")
+					}).Where("status = 1 ")
+				})
+			}).Where("status = 1  AND settle_accounts_date >= ? AND settle_accounts_date <= ? AND user_org_id = ? AND order_status = 2 AND patient_id = ? AND p_type=?", start_time, end_time, org_id, patient_id, settle_type)
+			break
+		case 1:
+			readDb2.Model(&models.HisChargeOrderTwo{}).Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
+				return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").
+					Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+						return db.Preload("Drug", "status = 1").Where("status = 1")
+					}).Where("status = 1 AND advice_id > 0 AND project_id = 0")
+			}).Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2  AND patient_id = ? AND p_type=?", start_time, end_time, org_id, patient_id, settle_type)
+
+			break
+		case 2:
+			readDb2.Model(&models.HisChargeOrderTwo{}).Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
+				return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").
+					Preload("HisChargePrescriptionProject", func(db *gorm.DB) *gorm.DB {
+						return db.Select("id,project_id,user_org_id,status,patient_id,record_date,count,type").Preload("HisChargeProject", func(db *gorm.DB) *gorm.DB {
+							return db.Select("id,project_name,unit").Where("status = 1 ")
+						}).Preload("HisChargeGoodInfo", func(db *gorm.DB) *gorm.DB {
+							return db.Select("id,good_name,good_unit,specification_name").Where("status = 1 ")
+						}).Where("status = 1 AND advice_id = 0 AND project_id > 0 ")
+					})
+			}).Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2 AND patient_id = ? AND p_type = ?", start_time, end_time, org_id, patient_id, settle_type)
+
+			break
+		case 3:
+			readDb2.Model(&models.HisChargeOrderTwo{}).Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
+				return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").
+					Preload("HisChargePrescriptionProject", func(db *gorm.DB) *gorm.DB {
+						return db.Select("id,project_id,user_org_id,status,patient_id,record_date,count,type").Preload("HisChargeProject", func(db *gorm.DB) *gorm.DB {
+							return db.Select("id,project_name,unit").Where("status = 1 ")
+						}).Preload("HisChargeGoodInfo", func(db *gorm.DB) *gorm.DB {
+							return db.Select("id,good_name,good_unit,specification_name").Where("status = 1 ")
+						}).Where("status = 1 AND advice_id = 0 AND project_id > 0 ")
+					})
+			}).Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2 AND patient_id = ? AND p_type = ?", start_time, end_time, org_id, patient_id, settle_type)
+			break
+		}
+
+	}
+	return
+}
+
+func GetPatientGather(patient_id int64, org_id int64, start_time int64, end_time int64, keyword string, item_type int64, settle_type int64) (patients []*models.HisChargeOrderTwo, err error) {
+	if len(keyword) == 0 {
+		switch item_type {
+		case 0:
+			readDb2.Model(&models.HisChargeOrderTwo{}).Joins("join his_patient his on his.number = his_order.mdtrt_id AND his.patient_id = ").Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
+				return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").
+					Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+						return db.Preload("Drug", "status = 1").Where("status = 1")
+					}).Preload("HisChargePrescriptionProject", func(db *gorm.DB) *gorm.DB {
+					return db.Select("id,project_id,user_org_id,status,patient_id,record_date,count,type").Preload("HisChargeProject", func(db *gorm.DB) *gorm.DB {
+						return db.Select("id,project_name,unit").Where("status = 1 ")
+					}).Preload("HisChargeGoodInfo", func(db *gorm.DB) *gorm.DB {
+						return db.Select("id,good_name,good_unit,specification_name").Where("status = 1 ")
+					}).Where("status = 1 ")
+				})
+			}).Where("status = 1  AND settle_accounts_date >= ? AND settle_accounts_date <= ? AND user_org_id = ? AND order_status = 2 AND patient_id = ? AND p_type=?", start_time, end_time, org_id, patient_id, settle_type)
+			break
+		case 1:
+			readDb2.Model(&models.HisChargeOrderTwo{}).Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
+				return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").
+					Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+						return db.Preload("Drug", "status = 1").Where("status = 1")
+					}).Where("status = 1 AND advice_id > 0 AND project_id = 0")
+			}).Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2  AND patient_id = ? AND p_type=?", start_time, end_time, org_id, patient_id, settle_type)
+
+			break
+		case 2:
+			readDb2.Model(&models.HisChargeOrderTwo{}).Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
+				return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").
+					Preload("HisChargePrescriptionProject", func(db *gorm.DB) *gorm.DB {
+						return db.Select("id,project_id,user_org_id,status,patient_id,record_date,count,type").Preload("HisChargeProject", func(db *gorm.DB) *gorm.DB {
+							return db.Select("id,project_name,unit").Where("status = 1 ")
+						}).Preload("HisChargeGoodInfo", func(db *gorm.DB) *gorm.DB {
+							return db.Select("id,good_name,good_unit,specification_name").Where("status = 1 ")
+						}).Where("status = 1 AND advice_id = 0 AND project_id > 0 ")
+					})
+			}).Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2 AND patient_id = ? AND p_type = ?", start_time, end_time, org_id, patient_id, settle_type)
+
+			break
+		case 3:
+			readDb2.Model(&models.HisChargeOrderTwo{}).Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
+				return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").
+					Preload("HisChargePrescriptionProject", func(db *gorm.DB) *gorm.DB {
+						return db.Select("id,project_id,user_org_id,status,patient_id,record_date,count,type").Preload("HisChargeProject", func(db *gorm.DB) *gorm.DB {
+							return db.Select("id,project_name,unit").Where("status = 1 ")
+						}).Preload("HisChargeGoodInfo", func(db *gorm.DB) *gorm.DB {
+							return db.Select("id,good_name,good_unit,specification_name").Where("status = 1 ")
+						}).Where("status = 1 AND advice_id = 0 AND project_id > 0 ")
+					})
+			}).Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2 AND patient_id = ? AND p_type = ?", start_time, end_time, org_id, patient_id, settle_type)
+			break
+		}
+
+	} else {
+		//keyword := "%" + keyword + "%"
+		switch item_type {
+		case 0:
+			readDb2.Model(&models.HisChargeOrderTwo{}).Joins("join his_patient his on his.number = his_order.mdtrt_id AND his.patient_id = ").Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
+				return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").
+					Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+						return db.Preload("Drug", "status = 1").Where("status = 1")
+					}).Preload("HisChargePrescriptionProject", func(db *gorm.DB) *gorm.DB {
+					return db.Select("id,project_id,user_org_id,status,patient_id,record_date,count,type").Preload("HisChargeProject", func(db *gorm.DB) *gorm.DB {
+						return db.Select("id,project_name,unit").Where("status = 1 ")
+					}).Preload("HisChargeGoodInfo", func(db *gorm.DB) *gorm.DB {
+						return db.Select("id,good_name,good_unit,specification_name").Where("status = 1 ")
+					}).Where("status = 1 ")
+				})
+			}).Where("status = 1  AND settle_accounts_date >= ? AND settle_accounts_date <= ? AND user_org_id = ? AND order_status = 2 AND patient_id = ? AND p_type=?", start_time, end_time, org_id, patient_id, settle_type)
+			break
+		case 1:
+			readDb2.Model(&models.HisChargeOrderTwo{}).Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
+				return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").
+					Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+						return db.Preload("Drug", "status = 1").Where("status = 1")
+					}).Where("status = 1 AND advice_id > 0 AND project_id = 0")
+			}).Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2  AND patient_id = ? AND p_type=?", start_time, end_time, org_id, patient_id, settle_type)
+
+			break
+		case 2:
+			readDb2.Model(&models.HisChargeOrderTwo{}).Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
+				return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").
+					Preload("HisChargePrescriptionProject", func(db *gorm.DB) *gorm.DB {
+						return db.Select("id,project_id,user_org_id,status,patient_id,record_date,count,type").Preload("HisChargeProject", func(db *gorm.DB) *gorm.DB {
+							return db.Select("id,project_name,unit").Where("status = 1 ")
+						}).Preload("HisChargeGoodInfo", func(db *gorm.DB) *gorm.DB {
+							return db.Select("id,good_name,good_unit,specification_name").Where("status = 1 ")
+						}).Where("status = 1 AND advice_id = 0 AND project_id > 0 ")
+					})
+			}).Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2 AND patient_id = ? AND p_type = ?", start_time, end_time, org_id, patient_id, settle_type)
+
+			break
+		case 3:
+			readDb2.Model(&models.HisChargeOrderTwo{}).Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
+				return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").
+					Preload("HisChargePrescriptionProject", func(db *gorm.DB) *gorm.DB {
+						return db.Select("id,project_id,user_org_id,status,patient_id,record_date,count,type").Preload("HisChargeProject", func(db *gorm.DB) *gorm.DB {
+							return db.Select("id,project_name,unit").Where("status = 1 ")
+						}).Preload("HisChargeGoodInfo", func(db *gorm.DB) *gorm.DB {
+							return db.Select("id,good_name,good_unit,specification_name").Where("status = 1 ")
+						}).Where("status = 1 AND advice_id = 0 AND project_id > 0 ")
+					})
+			}).Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2 AND patient_id = ? AND p_type = ?", start_time, end_time, org_id, patient_id, settle_type)
+			break
+		}
+
+	}
+	return
+}

service/his_hospital_service.go

@@ -315,7 +315,7 @@ func GetHospitalMonthHisPrescription(org_id int64, patient_id int64, start_time
 	return
 }
 
-func GetSettleHisHospitalPrescription(org_id int64, patient_id int64, his_patient_id int64, record_date int64) (prescription []*models.HisHospitalPrescription, err error) {
+func GetSettleHisHospitalPrescription(org_id int64, patient_id int64, batch_number string) (prescription []*models.HisHospitalPrescription, err error) {
 	err = readDb.Model(&models.HisHospitalPrescription{}).
 		Preload("HisAdditionalCharge", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("XtHisAddtionConfig", "status=1")
@@ -326,7 +326,7 @@ func GetSettleHisHospitalPrescription(org_id int64, patient_id int64, his_patien
 		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisOrderInfo", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1").Preload("XtHisProjectTeam", "status = 1")
 		}).
-		Where("user_org_id = ? AND status = 1 AND record_date >= ? AND patient_id = ? AND order_status = 4 ", org_id, record_date, patient_id).
+		Where("user_org_id = ? AND status = 1  AND patient_id = ? AND order_status = 4 AND batch_number = ? ", org_id, patient_id, batch_number).
 		Find(&prescription).Error
 	return
 }
@@ -523,3 +523,28 @@ func GetNewUnChargeHisHospitalPrescriptionFive(org_id int64, patient_id int64, h
 		Find(&prescription).Error
 	return
 }
+
+func GetZHHisUploadOrderInfo(org_id int64, patient_id int64, record_date int64, record_end_date int64, number string) (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_number = ? ", org_id, record_end_date, record_date, patient_id, number).
+		Find(&infos).Error
+	return
+}
+
+func UpDateOrderInfoStatus(patient_id int64, record_date int64, org_id int64, record_two_date 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_two_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, patient_id).Updates(map[string]interface{}{"order_status": 1}).Error
+	return
+}
+
+func UpdataHospitalOrderStatusTwo(number string, user_org_id int64) (err error) {
+	err = writeDb.Model(&models.HisOrderInfo{}).Where("status = 1 AND order_number = ? AND user_org_id = ?", number, user_org_id).Updates(map[string]interface{}{"status": 0}).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": 1, "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": 1, "mtime": time.Now().Unix()}).Error
+	return
+
+}

service/his_print_service.go

@@ -23,7 +23,7 @@ func GetBatchProjectHisPrescription(ids []string, record_time int64, user_org_id
 		Preload("HisPrintPrescription", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND type <> 1 AND p_type = 2", user_org_id, record_time).
 				Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
-					return db.Where("status = 1 ").Preload("HisProject", "status = 1").Preload("GoodInfo", "status=1")
+					return db.Where("his_prescription_project.status = 1 AND his_prescription_project.user_org_id = ?", user_org_id).Where("his_prescription_project.status = 1 ").Preload("HisProject", "status = 1").Preload("GoodInfo", "status=1")
 				})
 		}).
 		Preload("HisPrescriptionInfoTwo", "status = 1 AND record_date = ?", record_time).
@@ -37,7 +37,7 @@ func GetBatchInspectionProjectHisPrescription(ids []string, record_time int64, u
 		Preload("HisPrintPrescription", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND type <> 1 AND p_type = 2", user_org_id, record_time).
 				Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
-					return db.Where("status = 1 ").Preload("XtHisProjectTeam", "status = 1").Preload("HisProject", "status = 1 AND cost_classify = 3")
+					return db.Joins("Join xt_his_project p On p.id = his_prescription_project.project_id  AND p.cost_classify = 3").Where("his_prescription_project.status = 1 ").Preload("XtHisProjectTeam", "status = 1").Preload("HisProject", "status = 1")
 				})
 		}).
 		Preload("HisPrescriptionInfoTwo", "status = 1 AND record_date = ?", record_time).

service/his_project_service.go

@@ -370,7 +370,7 @@ func GetBloodPatientByPatient(id int64) (models.XtPatients, error) {
 	return patients, err
 }
 
-func GetHisPatientByIdTwo(patientid int64) (models.XtHisPatient, error) {
+func GetHisPatientByIdFour(patientid int64) (models.XtHisPatient, error) {
 
 	patient := models.XtHisPatient{}
 	err := XTReadDB().Model(&patient).Where("patient_id = ? and status=1", patientid).Find(&patient).Error
@@ -383,6 +383,12 @@ func GetHisPatientById(patientid int64) (models.VMHisPatient, error) {
 	return patient, err
 }
 
+func GetHisPatientByIdTwo(patientid int64) (models.VMHisPatient, error) {
+	patient := models.VMHisPatient{}
+	err := XTReadDB().Model(&patient).Where("patient_id = ? and status = 1", patientid).Limit(&patient).Error
+	return patient, err
+}
+
 func GetTemplateDetail(id int64) (models.HisCaseHistoryTemplate, error) {
 
 	template := models.HisCaseHistoryTemplate{}

service/his_service.go

@@ -304,6 +304,11 @@ func GetHisPatientInfoThree(org_id int64, number string) (info models.HisPatient
 	return
 }
 
+func GetHisPatientInfoFour(org_id int64, patient_id int64, record_date int64, his_patient_id int64) (info models.HisPatient, err error) {
+	err = readDb.Model(&models.HisPatient{}).Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND id = ?", org_id, record_date, patient_id, his_patient_id).First(&info).Error
+	return
+}
+
 func GetHisPatientInfoList(org_id int64, patient_id int64, record_date int64) (info []*models.HisPatient, err error) {
 	err = readDb.Model(&models.HisPatient{}).Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ?", org_id, record_date, patient_id).Find(&info).Error
 	return
@@ -587,6 +592,24 @@ func GetChargeMonthHisPrescriptionFour(org_id int64, patient_id int64, start_dat
 	return
 }
 
+func GetUnChargeMonthHisPrescriptionFour(org_id int64, patient_id int64, start_date int64, end_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("Drug", "status=1")
+		}).
+		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject").Preload("GoodInfo", "status=1").Preload("XtHisProjectTeam", "status = 1")
+		}).Preload("TempHisOrder", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1 AND user_org_id = ?", org_id)
+	}).
+		Where("user_org_id = ? AND status = 1 AND record_date >= ? AND record_date <= ? AND patient_id = ?  AND  order_status <> 2 AND order_status <> 3 AND order_status <> 4", org_id, start_date, end_date, patient_id).
+		Find(&prescription).Error
+	return
+}
+
 type OtherDrugWarehouseInfo struct {
 	ID               int64   `gorm:"column:id" json:"id" form:"id"`
 	DrugId           int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
@@ -888,7 +911,13 @@ func GetHisOrderList(user_org_id int64, page int64, limit int64, start_time_time
 			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)
+	if p_type > 0 {
+		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)
+
+	} else {
+		db = db.Where("his_order.status = 1 AND his_order.user_org_id = ? AND his_order.order_status = 2", user_org_id)
+
+	}
 	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).
@@ -1839,11 +1868,9 @@ type CustomAccountFormData struct {
 
 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 {
@@ -2134,7 +2161,9 @@ func GetUnChargeMonthHisPrescriptionSix(org_id int64, patient_id int64, start_da
 		}).
 		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject").Preload("GoodInfo", "status=1")
-		}).
+		}).Preload("TempHisOrder", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1 AND user_org_id = ?", org_id)
+	}).
 		Where("user_org_id = ? AND status = 1 AND record_date >= ? AND record_date <= ? AND patient_id = ?  AND p_type = ? AND order_status <> 2 ", org_id, start_date, end_date, patient_id, p_type).
 		Find(&prescription).Error
 	return
@@ -2150,7 +2179,9 @@ func GetChargeMonthHisPrescriptionSix(org_id int64, patient_id int64, start_date
 		}).
 		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject").Preload("GoodInfo", "status=1")
-		}).
+		}).Preload("TempHisOrder", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1 AND user_org_id = ?", org_id)
+	}).
 		Where("user_org_id = ? AND status = 1 AND record_date >= ? AND record_date <= ? AND patient_id = ?  AND p_type = ? AND order_status = 2 ", org_id, start_date, end_date, patient_id, p_type).
 		Find(&prescription).Error
 	return
@@ -2333,3 +2364,29 @@ func GetGoodWarehoseInfoByGoodId(good_id int64, org_id int64) (info models.GoodS
 	err = readDb.Model(&models.GoodSotckInfo{}).Where("stock_count > 0 and status = 1 and good_id = ? and org_id = ?", good_id, org_id).First(&info).Error
 	return
 }
+
+type MonthChargePatients 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"`
+	Name            string             `gorm:"column:name" json:"name" form:"name"`
+	Status          int64              `gorm:"column:status" json:"status" form:"status"`
+	PatientId       int64              `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Number          string             `gorm:"column:number" json:"number" form:"number"`
+	HisPrescription []*HisPrescription `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"prescription"`
+}
+
+func (MonthChargePatients) TableName() string {
+	return "his_patient"
+}
+
+func GetMonthUnChargeHisPatientList(org_id int64, record_date int64, start_time int64, end_time int64) (patients []*MonthChargePatients, err error) {
+	db := readDb.Model(&MonthChargePatients{}).Where("his_patient.user_org_id = ? AND his_patient.status = 1 AND his_patient.record_date = ?", org_id, record_date)
+	db = db.Preload("HisPrescription", "user_org_id = ? AND status = 1 AND record_date >= ? AND record_date <= ? AND p_type <> 1 AND order_status <> 2 AND order_status <> 3", org_id, start_time, end_time)
+	return
+}
+
+func UpdataOrderStatusThree(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": 5, "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": 5, "mtime": time.Now().Unix()}).Error
+	return
+}