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

controllers/his_api_controller.go

@@ -27,41 +27,28 @@ type HisApiController struct {
 func HisManagerApiRegistRouters() {
 
 	beego.Router("/api/hispatient/list", &HisApiController{}, "get:GetHisPatientList")
-	//beego.Router("/api/hispatient/list", &HisApiController{}, "get:GetHisPatientList")
-
 	beego.Router("/api/hispatient/get", &HisApiController{}, "get:GetHisPatientInfo")
 	beego.Router("/api/hisprescription/config", &HisApiController{}, "get:GetHisPrescriptionConfig")
-
 	beego.Router("/api/hisprescription/delete", &HisApiController{}, "post:DeletePrescription")
 	beego.Router("/api/advice/delete", &HisApiController{}, "post:DeleteDoctorAdvice")
 	beego.Router("/api/project/delete", &HisApiController{}, "post:DeleteProject")
 	beego.Router("/api/addition_charge/delete", &HisApiController{}, "post:DeleteAddition")
-
 	beego.Router("/api/hisprescription/list", &HisApiController{}, "get:GetHisPrescriptionList")
 	beego.Router("/api/hisprescription/info", &HisApiController{}, "get:GetHisPrescriptionInfo")
-
 	beego.Router("/api/hisprescription/create", &HisApiController{}, "post:CreateHisPrescription")
 	beego.Router("/api/hisprescription/edit", &HisApiController{}, "post:EditHisPrescription")
-
 	beego.Router("/api/doctorworkstation/casehistory/list", &HisApiController{}, "get:GetHisPatientCaseHistoryList")
 	beego.Router("/api/doctorworkstation/casehistory/get", &HisApiController{}, "get:GetHisPatientCaseHistory")
 	beego.Router("/api/doctorworkstation/casehistory/create", &HisApiController{}, "get:CreateHisPatientCaseHistory")
-
 	beego.Router("/api/doctorworkstation/casehistorytemplate/create", &HisApiController{}, "get:CreateCaseHistoryTemplate")
-
 	beego.Router("/api/doctorworkstation/casehistorytemplate/get", &HisApiController{}, "get:GetCaseHistoryTemplate")
-
 	beego.Router("/api/hisorder/list", &HisApiController{}, "get:GetHisOrderList")
-
 	beego.Router("/api/hisorder/get", &HisApiController{}, "get:GetHisOrder")
-
 	beego.Router("/api/register/get", &HisApiController{}, "get:GetRegisterInfo")
 	beego.Router("/api/upload/get", &HisApiController{}, "get:GetUploadInfo")
 	beego.Router("/api/presettle/get", &HisApiController{}, "get:PreSettle")
-
 	beego.Router("/api/refund/post", &HisApiController{}, "post:Refund")
 	beego.Router("/api/refundnumber/post", &HisApiController{}, "post:RefundNumber")
-
 	beego.Router("/api/medicalinsurance/config", &HisApiController{}, "get:GetMedicalInsuranceConfig")
 	beego.Router("/api/doctor/list", &HisApiController{}, "get:GetAdminUsers")
 
@@ -79,15 +66,12 @@ func HisManagerApiRegistRouters() {
 	beego.Router("/api/orderdetaicollect/get", &HisApiController{}, "get:GetAllOrderDetailCollect")
 	beego.Router("/api/cost/compare", &HisApiController{}, "get:GetMedicalInsuranceCostCompareList")
 	beego.Router("/api/record/list", &HisApiController{}, "get:GetPutOnRecordList")
-
 	beego.Router("/api/comparedata/get", &HisApiController{}, "get:GetCompareData")
 	beego.Router("/api/fapiao/get", &HisApiController{}, "get:GetFaPiaoData")
-
 	beego.Router("/api/incomestatistics/get", &HisApiController{}, "get:GetIncomeStatisticsData")
 
 	beego.Router("/api/postprojectinformation", &HisApiController{}, "post:PostProjectInformation")
 	//beego.Router("/api/editprojectinformation", &HisApiController{}, "post:EditProjectInformation")
-
 	beego.Router("/api/hisprescriptiontemplate/create", &HisApiController{}, "post:CreateHisPrescriptionTemplate")
 
 	beego.Router("/api/privateexpenses/get", &HisApiController{}, "get:GetPrivateExpensesInfo")
@@ -3704,6 +3688,7 @@ func (c *HisApiController) GetHisOrderList() {
 	types, _ := c.GetInt64("type", 0)
 	keywords := c.GetString("keywords")
 	p_type, _ := c.GetInt64("p_type", 0)
+	sort_type, _ := c.GetInt64("sort_type", 0)
 
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
@@ -3730,7 +3715,7 @@ func (c *HisApiController) GetHisOrderList() {
 
 	adminUser := c.GetAdminUserInfo()
 	org_id := adminUser.CurrentOrgId
-	order, err, total := service.GetHisOrderList(org_id, page, limit, startTime, endTime, types, keywords, p_type)
+	order, err, total := service.GetHisOrderList(org_id, page, limit, startTime, endTime, types, keywords, p_type, sort_type)
 
 	for _, item := range order {
 		info, _ := service.GetHisPrescriptionByPatientID(item.PatientId, item.UserOrgId)
@@ -4407,6 +4392,7 @@ func (c *HisApiController) GetUploadInfo() {
 			FaPiaoNumber:          fapiao_number,
 			Diagnosis:             diagnosis_id,
 			PType:                 2,
+			//SetlTime:			t
 		}
 		err = service.CreateOrder(order)
 		if err != nil {
@@ -5253,7 +5239,7 @@ func (c *HisApiController) GetFaPiaoData() {
 				laboratoryCostSelfTotal = laboratoryCostTotal
 			}
 
-			if item.MedChrgitmType == "05" { //治疗费
+			if item.MedChrgitmType == "05" || item.MedChrgitmType == "14" { //治疗费
 				treatCostTotal, _ = decimal.NewFromFloat(treatCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
 				treatCostSelfTotal = treatCostTotal
 			}
@@ -5278,7 +5264,7 @@ func (c *HisApiController) GetFaPiaoData() {
 				chineseTraditionalMedicineCostSelfTotal = chineseTraditionalMedicineCostTotal
 			}
 
-			if item.MedChrgitmType == "14" || item.MedChrgitmType == "0" || item.MedChrgitmType == "12" { //其他费
+			if item.MedChrgitmType == "0" || item.MedChrgitmType == "12" { //其他费
 				otherCostTotal, _ = decimal.NewFromFloat(otherCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
 				otherCostSelfTotal = otherCostTotal
 			}
@@ -5305,7 +5291,7 @@ func (c *HisApiController) GetFaPiaoData() {
 				laboratoryCostPartSelfTotal, _ = decimal.NewFromFloat(laboratoryCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
 			}
 
-			if item.MedChrgitmType == "05" { //治疗费
+			if item.MedChrgitmType == "05" || item.MedChrgitmType == "14" { //治疗费
 				treatCostTotal, _ = decimal.NewFromFloat(treatCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
 				treatCostSelfTotal, _ = decimal.NewFromFloat(treatCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
 				treatCostPartSelfTotal, _ = decimal.NewFromFloat(treatCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
@@ -5335,7 +5321,7 @@ func (c *HisApiController) GetFaPiaoData() {
 				chineseTraditionalMedicineCostPartSelfTotal, _ = decimal.NewFromFloat(chineseTraditionalMedicineCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
 			}
 
-			if item.MedChrgitmType == "14" || item.MedChrgitmType == "0" || item.MedChrgitmType == "12" || item.MedChrgitmType == "02" { //其他费
+			if item.MedChrgitmType == "0" || item.MedChrgitmType == "12" || item.MedChrgitmType == "02" { //其他费
 				otherCostTotal, _ = decimal.NewFromFloat(otherCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
 				otherCostSelfTotal, _ = decimal.NewFromFloat(otherCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
 				otherCostPartSelfTotal, _ = decimal.NewFromFloat(otherCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
@@ -6439,22 +6425,56 @@ func (c *HisApiController) GetPrivateExpensesInfo() {
 
 func (this *HisApiController) ChangeMedType() {
 	med_type := this.GetString("med_type")
-	id, _ := this.GetInt64("id")
+	old_med_type := this.GetString("old_med_type")
+	ids := this.GetString("ids")
+	settle_type, _ := this.GetInt64("settle_type")
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	ids_arr := strings.Split(ids, ",")
+	if settle_type == 1 { //日结
+		id, _ := strconv.ParseInt(ids_arr[0], 10, 64)
+		prescription, _ := service.GetPrescriptionById(id, this.GetAdminUserInfo().CurrentOrgId)
+		prescription.MedType = med_type
+		err := service.SaveHisPrescription(&prescription)
 
-	prescription, _ := service.GetPrescriptionById(id, this.GetAdminUserInfo().CurrentOrgId)
-	prescription.MedType = med_type
-	err := service.SaveHisPrescription(&prescription)
+		if err == nil {
+			this.ServeSuccessJSON(map[string]interface{}{
+				"msg": "修改成功",
+			})
 
-	if err == nil {
-		this.ServeSuccessJSON(map[string]interface{}{
-			"msg": "修改成功",
-		})
+		} else {
 
-	} else {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
 
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
-		return
+		}
 
+	} else if settle_type == 2 {
+		timeLayout := "2006-01-02"
+		loc, _ := time.LoadLocation("Local")
+		theStartTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		recordStartTime := theStartTime.Unix()
+		start_time_timestamp := recordStartTime
+		theEndTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		recordEndTime := theEndTime.Unix()
+		end_time_timestamp := recordEndTime
+		updateErr := service.UpdateBatchHisPrescriptionMedType(ids_arr, med_type, start_time_timestamp, end_time_timestamp, this.GetAdminUserInfo().CurrentOrgId, old_med_type)
+		if updateErr == nil {
+			this.ServeSuccessJSON(map[string]interface{}{
+				"msg": "修改成功",
+			})
+		} else {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+		}
 	}
 
 }

controllers/his_charge_api_controller.go

@@ -28,6 +28,8 @@ func HisChargeApiRegistRouters() {
 	beego.Router("/api/fapiao", &HisChargeApiController{}, "get:GetFaPiaoRecord")
 	beego.Router("/api/fapiao/is_use", &HisChargeApiController{}, "post:UpdateFaPiaoRecordIsUse")
 
+	beego.Router("/api/his/getyidiclear", &HisChargeApiController{}, "get:GetHisYidiClearRecord")
+
 }
 
 func (c *HisChargeApiController) UpdateFaPiaoRecordIsUse() {
@@ -301,3 +303,16 @@ func (c *HisChargeApiController) GetHisInspectionInfo() {
 		return
 	}
 }
+
+func (c *HisChargeApiController) GetHisYidiClearRecord() {
+	records, err := service.FindHisYidiClearRecord(c.GetAdminUserInfo().CurrentOrgId)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"list": records,
+		})
+		return
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+}

controllers/his_print_api_controller.go

@@ -0,0 +1,53 @@
+package controllers
+
+import (
+	"XT_New/enums"
+	"XT_New/service"
+	"github.com/astaxie/beego"
+	"strings"
+	"time"
+)
+
+type HisPrintApiController struct {
+	BaseAuthAPIController
+}
+
+func HisPrintApiRegistRouters() {
+	beego.Router("/api/his/prescription/print", &HisPrintApiController{}, "get:GetBatchHisPrescriptionData")
+}
+
+func (c *HisPrintApiController) GetBatchHisPrescriptionData() {
+	record_date := c.GetString("record_date")
+	patient_ids := c.GetString("patient_ids")
+	print_type, _ := c.GetInt64("type")
+	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()
+	adminInfo := c.GetAdminUserInfo()
+	ids := strings.Split(patient_ids, ",")
+	switch print_type {
+	case 1:
+		patients, _ := service.GetBatchDrugHisPrescription(ids, recordDateTime, adminInfo.CurrentOrgId)
+		c.ServeSuccessJSON(map[string]interface{}{
+			"patients": patients,
+		})
+		break
+	case 2:
+		patients, _ := service.GetBatchProjectHisPrescription(ids, recordDateTime, adminInfo.CurrentOrgId)
+		c.ServeSuccessJSON(map[string]interface{}{
+			"patients": patients,
+		})
+		break
+	case 3:
+		patients, _ := service.GetBatchInspectionProjectHisPrescription(ids, recordDateTime, adminInfo.CurrentOrgId)
+		c.ServeSuccessJSON(map[string]interface{}{
+			"patients": patients,
+		})
+		break
+	}
+}

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -189,7 +189,12 @@ func (this *DialysisAPIController) Scheduals() {
 			}
 
 			//获取今日所有的处方开的耗材
-			project, _ := service.GetAllHisProjectPrescription(orgID, date.Unix())
+			_, configs := service.FindXTHisProjectByOrgId(orgID)
+			project := make([]*models.HisPrescriptionProjectTwo, 0)
+
+			if configs.ID > 0 && configs.IsOpen == 1 {
+				project, _ = service.GetAllHisProjectPrescription(orgID, date.Unix())
+			}
 
 			//获取今日透析准备的数据
 			//goodList, err := service.MobileGetDialysisGoodsSeven(orgID, date.Unix())
@@ -220,7 +225,12 @@ func (this *DialysisAPIController) Scheduals() {
 
 		}
 		//获取今日所有的处方开的耗材
-		project, _ := service.GetAllHisProjectPrescription(orgID, date.Unix())
+		_, configs := service.FindXTHisProjectByOrgId(orgID)
+		project := make([]*models.HisPrescriptionProjectTwo, 0)
+
+		if configs.ID > 0 && configs.IsOpen == 1 {
+			project, _ = service.GetAllHisProjectPrescription(orgID, date.Unix())
+		}
 
 		//获取今日透析准备的数据
 		//goodList, err := service.MobileGetDialysisGoodsSeven(orgID, date.Unix())

controllers/supply_order_api_contorller.go

@@ -20,12 +20,21 @@ type SupplyOrderApiController struct {
 }
 
 func SupplyOrderApiRegistRouters() {
-
+	//获取供应商列表GetSupplyList
+	beego.Router("/api/supply/getsupplylist", &SupplyOrderApiController{}, "get:GetSupplyList")
+	//保存供应商及联系人（用于更改）
+	beego.Router("/api/supply/updatesupply", &SupplyOrderApiController{}, "post:UpdateSupply")
+	//删除单条联系人
+	beego.Router("/api/supply/delcontactone", &SupplyOrderApiController{}, "get:DelContactOne")
+	//获取单条供应商和涉及到的联系人记录
+	beego.Router("/api/supply/getsupplyandcontactone", &SupplyOrderApiController{}, "get:GetSupplyAndContactOne")
+	//获取供应商类别
+	beego.Router("/api/supply/getsupplytype", &SupplyOrderApiController{}, "get:GetSupplyType")
 	//删除供应商及联系人
 	beego.Router("/api/supply/delsupply", &SupplyOrderApiController{}, "post:DelSupply")
 	//获取供应商编码
 	beego.Router("/api/supply/getsupplycode", &SupplyOrderApiController{}, "get:GetSupplyCode")
-	//保存供应商及联系人
+	//保存供应商及联系人（用于新增）
 	beego.Router("/api/supply/savesupply", &SupplyOrderApiController{}, "post:SaveSupply")
 
 	beego.Router("/api/supply/getinitorder", &SupplyOrderApiController{}, "get:GetInitOrder")
@@ -81,6 +90,210 @@ func SupplyOrderApiRegistRouters() {
 	beego.Router("/api/supply/getsupplywarehouseoutbyid", &SupplyOrderApiController{}, "Get:GetSupplyWarehouseById")
 }
 
+//获取供应商列表GetSupplyList
+func (this *SupplyOrderApiController) GetSupplyList() {
+	ctype, _ := this.GetInt64("ctype") //供应商类别
+	page, _ := this.GetInt64("page")   //页码
+	limit, _ := this.GetInt64("limit") //每一页查出来的条数
+	if page == 0 || limit == 0 {
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "page或limit参数不能为空")
+		return
+	}
+	code := this.GetString("code")   //供应商编号
+	sname := this.GetString("sname") //供应商名称
+	cname := this.GetString("cname") //联系人名字
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	//获取分页的数据
+	list, total, err := service.GetSupplyList(ctype, page, limit, code, sname, cname)
+	//获取供应商类别
+	costClassify := "供应商类别"
+	drugTypeParent, _ := service.GetDrugDataConfig(0, costClassify)
+	drugTypeList, _ := service.GetParentDataConfig(drugTypeParent.ID, orgId)
+	tmpmap := make(map[int64]string)    //储存供应商类别
+	namemap := make(map[string]string)  //储存首要联系人
+	phonemap := make(map[string]string) //手机号
+	for i := 0; i < len(drugTypeList); i++ {
+		k := int64(drugTypeList[i].Value)
+		v := drugTypeList[i].Name
+		tmpmap[k] = v
+	}
+	if err == nil {
+		for i := 0; i < len(list); i++ {
+			code := list[i].SupplierCode
+			fistname, errs := service.FindName(code)
+			if errs != nil && errs.Error() != "record not found" {
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+				return
+			}
+			namemap[code] = fistname.Name
+			phonemap[code] = fistname.Phone
+		}
+		type SpSupplierNameList struct { //基于SpSupplierName结构体修改的，为了方便前端取数据整合了一下，删除了几个用不到的字段，添加了联系人名字和供应商类别两个字段
+			ID           int64
+			SupplierCode string
+			SupplierName string
+			SupplierType int64
+			VatRate      float64
+			Number       string
+			Bank         string
+			BankAccount  string
+			UserOrgId    int64
+			Status       int64
+			ContactsId   int64
+			ConName      string //供应商主要联系人名字
+			TypeName     string //供应商类别
+			Phone        string //电话
+		}
+		//初始化该结构体
+		tmplist := []*SpSupplierNameList{}
+		for i := 0; i < len(list); i++ {
+			var typename string //类别名称
+			if list[i].SupplierType == 0 {
+				typename = ""
+			} else {
+				typename = tmpmap[list[i].SupplierType]
+			}
+			tlist := &SpSupplierNameList{
+				list[i].ID,
+				list[i].SupplierCode,
+				list[i].SupplierName,
+				list[i].SupplierType,
+				list[i].VatRate,
+				list[i].Number,
+				list[i].Bank,
+				list[i].BankAccount,
+				list[i].UserOrgId,
+				list[i].Status,
+				list[i].ContactsId,
+				namemap[list[i].SupplierCode],
+				typename,
+				phonemap[list[i].SupplierCode],
+			}
+			tmplist = append(tmplist, tlist)
+
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list":  tmplist,
+			"total": total,
+		})
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
+}
+
+//保存供应商及联系人（用于更改）
+func (this *SupplyOrderApiController) UpdateSupply() {
+	supplierName := this.GetString("suppliername") //供应商名称
+	if supplierName == "" {
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "供应商名称不能为空")
+		return
+	}
+	supplierCode := this.GetString("suppliercode") //供应商编码
+	if supplierCode == "" {
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "供应商编号不能为空")
+		return
+	}
+	supplierid, _ := this.GetInt64("id") //供应商id
+	if supplierid == 0 {
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "供应商id不能为空")
+		return
+	}
+	//查询供应商的信息
+	supply, err := service.GetSupplyOne(supplierid)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	if supplierName != supply.SupplierName {
+		//判断供应商名称是否有重复的
+		sbool, _ := service.FindSupplierName(supplierName)
+		if sbool { //有重复的
+			this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "供应商名称重复")
+			return
+		}
+	}
+	if supplierCode != supply.SupplierCode {
+		//判断供应商编号是否有重复的
+		codebool, _ := service.FindSupplierCode(supplierCode)
+		if codebool {
+			this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "供应商编号重复")
+			return
+		}
+	}
+	supplierType, _ := this.GetInt64("suppliertype") //供应商类别
+	vatRate, _ := this.GetFloat("vatrate")           //增值税税率
+	number := this.GetString("number")               //纳税人识别号
+	bank := this.GetString("bank")                   //开户银行
+	bankAccount := this.GetString("bankAccount")     //银行账号
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	//contacts := this.Get("contacts")//联系人
+	dataBody := make(map[string]interface{}, 0)
+	err = json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	//保存联系人
+	if dataBody["contacts"] != nil && reflect.TypeOf(dataBody["contacts"]).String() == "[]interface {}" {
+		thisStockIn, _ := dataBody["contacts"].([]interface{})
+		if len(thisStockIn) > 0 {
+			if len(thisStockIn) == 1 {
+				for _, item := range thisStockIn {
+					items := item.(map[string]interface{})
+					items["IsFirst"] = 1
+				}
+			}
+			tmodify := this.GetAdminUserInfo().AdminUser.Id
+			err = service.UpdateSupplyAndContact(thisStockIn, supplierid, orgId, supplierType, tmodify, supplierCode, supplierName, number, bank, bankAccount, vatRate)
+			if err != nil {
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+		} else {
+			this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "联系人不能为空")
+			return
+		}
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": "保存成功",
+	})
+	return
+}
+
+//获取单条供应商和涉及到的联系人记录
+func (this *SupplyOrderApiController) GetSupplyAndContactOne() {
+	id, _ := this.GetInt64("id")
+	if id == 0 {
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "供应商id不能为空")
+		return
+	}
+	supply, contact, err := service.GetSupplyAndContactOne(id)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"supply":  supply,
+		"contact": contact,
+	})
+	return
+}
+
+//获取供应商类别
+func (this *SupplyOrderApiController) GetSupplyType() {
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	costClassify := "供应商类别"
+	drugTypeParent, _ := service.GetDrugDataConfig(0, costClassify)
+	drugTypeList, _ := service.GetParentDataConfig(drugTypeParent.ID, orgId)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": drugTypeList,
+	})
+	return
+}
+
 //删除供应商及联系人
 func (this *SupplyOrderApiController) DelSupply() {
 	//拿到供应商的id
@@ -104,6 +317,25 @@ func (this *SupplyOrderApiController) DelSupply() {
 	return
 }
 
+//删除单条联系人记录
+func (this *SupplyOrderApiController) DelContactOne() {
+	id, _ := this.GetInt64("id")
+	if id == 0 {
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "联系人id不能为空")
+		return
+	}
+	err := service.DelContactOne(id)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": "删除成功",
+	})
+	return
+}
+
 //获取供应商编码
 func (this *SupplyOrderApiController) GetSupplyCode() {
 	supply, err := service.GetSuppliyCode()
@@ -154,6 +386,12 @@ func (this *SupplyOrderApiController) SaveSupply() {
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "供应商编号不能为空")
 		return
 	}
+	//判断供应商编号是否有重复的
+	codebool, _ := service.FindSupplierCode(supplierCode)
+	if codebool {
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "供应商编号重复")
+		return
+	}
 	supplierType, _ := this.GetInt64("suppliertype") //供应商类别
 	vatRate, _ := this.GetFloat("vatrate")           //增值税税率
 	number := this.GetString("number")               //纳税人识别号

models/his_models.go

@@ -1168,6 +1168,8 @@ type MedicalInsuranceOrgConfig struct {
 	MdtrtareaAdmvs string `gorm:"column:mdtrtarea_admvs" json:"mdtrtarea_admvs" form:"mdtrtarea_admvs"`
 	InsuplcAdmdvs  string `gorm:"column:insuplc_admdvs" json:"insuplc_admdvs" form:"insuplc_admdvs"`
 	SecretKey      string `gorm:"column:secret_key" json:"secret_key" form:"secret_key"`
+	AccessKey      string `gorm:"column:access_key" json:"access_key" form:"access_key"`
+	Cainfo         string `gorm:"column:cainfo" json:"cainfo" form:"cainfo"`
 }
 
 func (MedicalInsuranceOrgConfig) TableName() string {
@@ -1875,3 +1877,48 @@ type NewCustomHisPrescriptionProject struct {
 func (NewCustomHisPrescriptionProject) TableName() string {
 	return "his_prescription_project"
 }
+
+type HisYidiClearRecord 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"`
+	Status          int64   `gorm:"column:status" json:"status" form:"status"`
+	Certno          string  `gorm:"column:certno" json:"certno" form:"certno"`
+	MdtrtId         string  `gorm:"column:mdtrt_id" json:"mdtrt_id" form:"mdtrt_id"`
+	MdtrtSetlTime   string  `gorm:"column:mdtrt_setl_time" json:"mdtrt_setl_time" form:"mdtrt_setl_time"`
+	SetlSn          string  `gorm:"column:setl_sn" json:"setl_sn" form:"setl_sn"`
+	MedfeeSumant    float64 `gorm:"column:medfee_sumant" json:"medfee_sumant" form:"medfee_sumant"`
+	OptinsPaySumamt float64 `gorm:"column:optins_pay_sumamt" json:"optins_pay_sumamt" form:"optins_pay_sumamt"`
+	CnfmFlag        int64   `gorm:"column:cnfm_flag" json:"cnfm_flag" form:"cnfm_flag"`
+	MsgId           string  `gorm:"column:msg_id" json:"msg_id" form:"msg_id"`
+}
+
+func (HisYidiClearRecord) TableName() string {
+	return "his_yidi_clear_record"
+}
+
+type HisPrescriptionProjectTwo struct {
+	ID             int64   `gorm:"column:id" json:"id" form:"id"`
+	ProjectId      int64   `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	Price          float64 `gorm:"column:price" json:"price" form:"price"`
+	UserOrgId      int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status         int64   `gorm:"column:status" json:"status" form:"status"`
+	PatientId      int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	RecordDate     int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	PrescriptionId int64   `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
+	Count          string  `gorm:"column:count" json:"count" form:"count"`
+	FeedetlSn      string  `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	Type           int64   `gorm:"column:type" json:"type" form:"type"`
+	Doctor         int64   `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	ExecutionTime  int64   `gborm:"column:execution_time" json:"execution_time" form:"execution_time"`
+	ExecutionStaff int64   `gorm:"column:execution_staff" json:"execution_staff" form:"execution_staff"`
+	ExecutionState int64   `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
+	CheckTime      int64   `gorm:"column:check_time" json:"check_time" form:"check_time"`
+	CheckState     int64   `gorm:"column:check_state" json:"check_state" form:"check_state"`
+	Checker        int64   `gorm:"column:checker" json:"checker" form:"checker"`
+}
+
+func (HisPrescriptionProjectTwo) TableName() string {
+	return "his_prescription_project"
+}

models/his_print_models.go

@@ -0,0 +1,123 @@
+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"`
+}
+
+func (PrintPatient) TableName() string {
+	return "xt_patients"
+}
+
+type HisPrintPatient struct {
+	ID                     int64   `gorm:"column:id" json:"id" form:"id"`
+	BalanceAccountsType    int64   `gorm:"column:balance_accounts_type" json:"balance_accounts_type" form:"balance_accounts_type"`
+	MedicalInsuranceNumber string  `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
+	Name                   string  `gorm:"column:name" json:"name" form:"name"`
+	Gender                 int64   `gorm:"column:gender" json:"gender" form:"gender"`
+	IdType                 int64   `gorm:"column:id_type" json:"id_type" form:"id_type"`
+	RecordDate             int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	PhoneNumber            string  `gorm:"column:phone_number" json:"phone_number" form:"phone_number"`
+	IdCardNo               string  `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
+	RegisterType           int64   `gorm:"column:register_type" json:"register_type" form:"register_type"`
+	AdminUserId            int64   `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	Departments            int64   `gorm:"column:departments" json:"departments" form:"departments"`
+	Total                  float64 `gorm:"column:total" json:"total" form:"total"`
+	UserOrgId              int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	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"`
+	Doctor                 int64   `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	IsReturn               int64   `gorm:"column:is_return" json:"is_return" form:"is_return"`
+	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"`
+	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"`
+	Phone                  string  `gorm:"column:phone" json:"phone" form:"phone"`
+	SocialType             int64   `gorm:"column:social_type" json:"social_type" form:"social_type"`
+	IdCardType             int64   `gorm:"column:id_card_type" json:"id_card_type" form:"id_card_type"`
+	PType                  int64   `gorm:"column:p_type" json:"p_type" form:"p_type"`
+	Diagnosis              string  `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	SickType               int64   `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
+	PatientInfo            string  `gorm:"column:patient_info" json:"patient_info" form:"patient_info"`
+}
+
+func (HisPrintPatient) TableName() string {
+	return "his_patient"
+}
+
+type HisPrintPrescription 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"`
+	RecordDate             int64                     `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	PatientId              int64                     `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HisPatientId           int64                     `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_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"`
+	Number                 string                    `gorm:"column:number" json:"number" form:"number"`
+	Type                   int64                     `gorm:"column:type" json:"type" form:"type"`
+	Doctor                 string                    `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	Creator                int64                     `gorm:"column:creator" json:"creator" form:"creator"`
+	Modifier               int64                     `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	OrderStatus            int64                     `gorm:"column:order_status" json:"order_status" form:"order_status"`
+	PreTime                int64                     `gorm:"column:pre_time" json:"pre_time" form:"pre_time"`
+	BatchNumber            string                    `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	PrescriptionNumber     string                    `gorm:"column:prescription_number" json:"prescription_number" form:"prescription_number"`
+	Patients               Patients                  `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
+	HisPatient             VMHisPatient              `gorm:"ForeignKey:PatientId;AssociationForeignKey:patient_id" json:"hisPatient"`
+	HisDoctorAdviceInfo    []*HisDoctorAdviceInfo    `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"advices"`
+	HisPrescriptionProject []*HisPrescriptionProject `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"project"`
+	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"`
+}
+
+func (HisPrintPrescription) TableName() string {
+	return "his_prescription"
+}
+
+type HisPrescriptionInfoTwo 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"`
+	RecordDate         int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	PatientId          int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HisPatientId       int64  `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_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"`
+	Creator            int64  `gorm:"column:creator" json:"creator" form:"creator"`
+	Modifier           int64  `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	Diagnosis          string `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	RegisterType       int64  `gorm:"column:register_type" json:"register_type" form:"register_type"`
+	Doctor             string `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	Departments        string `gorm:"column:departments" json:"departments" form:"departments"`
+	SickHistory        string `gorm:"column:sick_history" json:"sick_history" form:"sick_history"`
+	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"`
+	DepartmentId       int64  `gorm:"column:department_id" json:"department_id" form:"department_id"`
+	SickType           int64  `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
+}
+
+func (HisPrescriptionInfoTwo) TableName() string {
+	return "his_prescription_info"
+}

models/supply.models.go

@@ -2,15 +2,16 @@ package models
 
 //供应商联系人
 type SpSupplierContacts struct {
-	ID        int64  `gorm:"column:id" json:"id" from:"id"`
-	Name      string `gorm:"column:name" json:"name" from:"name"`
-	Phone     string `gorm:"column:phone" json:"phone" from:"phone"`
-	Address   string `gorm:"column:address" json:"address" from:"address"`
-	IsFirst   int64  `gorm:"column:is_first" json:"is_first" from:"is_first"`
-	UserOrgId int64  `gorm:"column:user_org_id" json:"user_org_id" from:"user_org_id"`
-	Status    int64  `gorm:"column:status" json:"status" from:"status"`
-	Ctime     int64  `gorm:"column:ctime" json:"ctime" from:"ctime"`
-	Mtime     int64  `gorm:"column:mtime" json:"mtime" from:"mtime"`
+	ID           int64  `gorm:"column:id" json:"id" from:"id"`
+	Name         string `gorm:"column:name" json:"name" from:"name"`
+	Phone        string `gorm:"column:phone" json:"phone" from:"phone"`
+	Address      string `gorm:"column:address" json:"address" from:"address"`
+	IsFirst      int64  `gorm:"column:is_first" json:"is_first" from:"is_first"`
+	SupplierCode string `gorm:"column:supplier_code" json:"supplier_code" from:"supplier_code"`
+	UserOrgId    int64  `gorm:"column:user_org_id" json:"user_org_id" from:"user_org_id"`
+	Status       int64  `gorm:"column:status" json:"status" from:"status"`
+	Ctime        int64  `gorm:"column:ctime" json:"ctime" from:"ctime"`
+	Mtime        int64  `gorm:"column:mtime" json:"mtime" from:"mtime"`
 }
 
 func (SpSupplierContacts) TableName() string {

routers/router.go

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

service/gobal_config_service.go

@@ -248,7 +248,7 @@ func GetExportHisOrderList(user_org_id int64, start_time int64, end_time int64,
 		Preload("HisPrescriptionInfo", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1 AND user_org_id = ?", user_org_id).Preload("XtHisDepartment", "status = 1")
 		})
-	err = db.Order("ctime desc").Find(&order).Error
+	err = db.Order("setl_time asc").Find(&order).Error
 	return
 }
 

service/his_charge_service.go

@@ -301,3 +301,13 @@ func FindFapiaoByIsUse(org_id int64) (models.HisFapiaoRecord, error) {
 	err := readDb.Model(&models.HisFapiaoRecord{}).Where("user_org_id = ? AND status = 1 AND is_use = 1", org_id).First(&record).Error
 	return record, err
 }
+
+func FindHisYidiClearRecord(org_id int64) (records []*models.HisYidiClearRecord, err error) {
+	err = readDb.Model(&models.HisYidiClearRecord{}).Where("user_org_id = ? AND status = 1", org_id).Find(&records).Error
+	return
+}
+
+func GetHisYidiClearRecordById(org_id int64, id int64) (record models.HisYidiClearRecord, err error) {
+	err = readDb.Model(&models.HisYidiClearRecord{}).Where("user_org_id = ? AND status = 1 AND id = ?", org_id, id).First(&record).Error
+	return
+}

service/his_print_service.go

@@ -0,0 +1,47 @@
+package service
+
+import (
+	"XT_New/models"
+	"github.com/jinzhu/gorm"
+)
+
+func GetBatchDrugHisPrescription(ids []string, record_time int64, user_org_id int64) (patients []*models.PrintPatient, err error) {
+	readDb.Model(&models.PrintPatient{}).Preload("HisPrintPatient", "status = 1 AND record_date = ?", record_time).
+		Preload("HisPrintPrescription", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND type = 1", user_org_id, record_time).
+				Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+					return db.Where("status = 1 AND user_org_id = ?", user_org_id).Preload("Drug", "status=1")
+				})
+		}).
+		Preload("HisPrescriptionInfoTwo", "status = 1 AND record_date = ?", record_time).
+		Where("id in (?) AND user_org_id = ?", ids, user_org_id).Find(&patients)
+	return
+}
+
+func GetBatchProjectHisPrescription(ids []string, record_time int64, user_org_id int64) (patients []*models.PrintPatient, err error) {
+	readDb.Model(&models.PrintPatient{}).Preload("HisPrintPatient", "status = 1 AND record_date = ?", record_time).
+		Preload("HisPrintPrescription", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND type <> 1", 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")
+				})
+		}).
+		Preload("HisPrescriptionInfoTwo", "status = 1 AND record_date = ?", record_time).
+		Where("id in (?) AND user_org_id = ?  ", ids, user_org_id).Find(&patients)
+	return
+
+}
+
+func GetBatchInspectionProjectHisPrescription(ids []string, record_time int64, user_org_id int64) (patients []*models.PrintPatient, err error) {
+	readDb.Model(&models.PrintPatient{}).Preload("HisPrintPatient", "status = 1 AND record_date = ?", record_time).
+		Preload("HisPrintPrescription", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND type <> 1", user_org_id, record_time).
+				Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+					return db.Where("status = 1 ").Preload("HisProject", "status = 1 AND cost_classify = 3")
+				})
+		}).
+		Preload("HisPrescriptionInfoTwo", "status = 1 AND record_date = ?", record_time).
+		Where("id in (?) AND user_org_id = ?  ", ids, user_org_id).Find(&patients)
+	return
+
+}

service/his_service.go

@@ -854,7 +854,7 @@ func SavePatientPrescriptionInfo(info models.HisPrescriptionInfo) (err error) {
 	return
 }
 
-func GetHisOrderList(user_org_id int64, page int64, limit int64, start_time int64, end_time int64, doctor_id int64, keywords string, p_type int64) (order []*models.HisOrder, err error, total int64) {
+func GetHisOrderList(user_org_id int64, page int64, limit int64, start_time int64, end_time int64, doctor_id int64, keywords string, p_type int64, sort_type int64) (order []*models.HisOrder, err error, total int64) {
 	offset := (page - 1) * limit
 	db := readDb.Model(&models.HisOrder{})
 
@@ -883,7 +883,24 @@ func GetHisOrderList(user_org_id int64, page int64, limit int64, start_time int6
 		Preload("HisHospitalCheckRecord", "status = 1 AND user_org_id = ?", user_org_id)
 	db = db.Preload("HisFundSettleListResult", "status = 1")
 	db = db.Count(&total)
-	err = db.Limit(limit).Offset(offset).Order("settle_accounts_date desc,ctime").Find(&order).Error
+	db = db.Limit(limit).Offset(offset)
+	if user_org_id == 10215 {
+		if sort_type == 1 {
+			err = db.Order("settle_accounts_date asc,ctime asc").Find(&order).Error
+		}
+		if sort_type == 2 {
+			err = db.Order("setl_time asc,ctime asc").Find(&order).Error
+		}
+
+	} else {
+		if sort_type == 1 {
+			err = db.Order("settle_accounts_date desc,ctime desc").Find(&order).Error
+		}
+		if sort_type == 2 {
+			err = db.Order("setl_time desc,ctime desc").Find(&order).Error
+		}
+	}
+
 	return
 }
 
@@ -2248,3 +2265,13 @@ func GetHisDoctorAdviceInfo(id int64) (models.HisDoctorAdviceInfo, error) {
 	err := readDb.Model(&info).Where("id = ? and status = 1", id).Preload("Drug", "status = 1").Find(&info).Error
 	return info, err
 }
+
+func UpdateBatchHisPrescriptionMedType(ids []string, med_type string, start_time int64, end_time int64, user_org_id int64, old_med_type string) (err error) {
+	tx := writeDb.Begin()
+	if err = tx.Model(&models.HisPrescription{}).Where("id in (?) AND status = 1 AND user_org_id=? AND med_type = ? AND record_date >= ? AND record_date <= ?", ids, user_org_id, old_med_type, start_time, end_time).Updates(map[string]interface{}{"med_type": med_type}).Error; err != nil {
+		tx.Rollback()
+		return
+	}
+	tx.Commit()
+	return
+}

service/patient_service.go

@@ -2612,10 +2612,7 @@ func GetAllPrescriptionByListOne(orgID int64, scheduleDate int64) (prescriptions
 	}
 }
 
-func GetAllHisProjectPrescription(orgid int64, recorddate int64) (project []*models.HisPrescriptionProject, err error) {
-
-	err = XTReadDB().Where("user_org_id = ? and record_date = ? and status = 1", orgid, recorddate).Preload("GoodInfo", func(db *gorm.DB) *gorm.DB {
-		return db.Preload("GoodsType", "status = 1").Where("status = 1 ")
-	}).Find(&project).Error
+func GetAllHisProjectPrescription(orgid int64, recorddate int64) (project []*models.HisPrescriptionProjectTwo, err error) {
+	err = XTReadDB().Where("user_org_id = ? and record_date = ? and status = 1", orgid, recorddate).Find(&project).Error
 	return project, err
 }

service/supply_service.go

@@ -7,6 +7,158 @@ import (
 	"time"
 )
 
+//根据供应商编号获取首要联系人
+func FindName(code string) (fistname models.SpSupplierContacts, err error) {
+	err = XTReadDB().Model(&models.SpSupplierContacts{}).Where("supplier_code = ? and status = 1", code).First(&fistname).Error
+	return fistname, err
+}
+
+//供应商分页
+func GetSupplyList(ctype int64, page int64, limit int64, code string, sname string, cname string) (supplylist []*models.SpSupplierName, total int64, err error) {
+	db := XTReadDB().Model(&supplylist).Where("sgj_xt.xt_supplier_name.status = 1 ")
+
+	offset := (page - 1) * limit
+
+	if cname != "" {
+		cname = "%" + cname + "%" //联系人
+		db = db.Joins("join sgj_xt.xt_supplier_contacts on sgj_xt.xt_supplier_contacts.supplier_code = sgj_xt.xt_supplier_name.supplier_code")
+		db = db.Where("sgj_xt.xt_supplier_contacts.name like ? and sgj_xt.xt_supplier_contacts.status = 1 ", cname).Group("sgj_xt.xt_supplier_name.id")
+	}
+	if ctype > 0 {
+		db = db.Where("sgj_xt.xt_supplier_name.supplier_type = ?", ctype)
+	}
+	if code != "" {
+		code = "%" + code + "%" //供应商编码
+		db = db.Where("sgj_xt.xt_supplier_name.supplier_code = ?", code)
+	}
+	if sname != "" {
+		sname = "%" + sname + "%" //供应商名称
+		db = db.Where("sgj_xt.xt_supplier_name.supplier_name = ?", sname)
+	}
+	err = db.Count(&total).Offset(offset).Limit(limit).Find(&supplylist).Error
+	return supplylist, total, err
+}
+
+//修改供应商和联系人
+func UpdateSupplyAndContact(thisStockIn []interface{}, suid, orgId, supplierType, tcreater int64, supplierCode, supplierName, number, bank, bankAccount string, vatRate float64) error {
+	tx := XTWriteDB().Begin()
+	defer func() {
+		if err != nil {
+			tx.Rollback()
+		} else {
+			tx.Commit()
+		}
+	}()
+	for _, item := range thisStockIn {
+		items := item.(map[string]interface{})
+		//查询是否
+		id, _ := strconv.ParseInt(items["id"].(string), 10, 64)
+		name := items["name"].(string)
+		phone := items["phone"].(string)
+		address := items["address"].(string)
+		isfirst, _ := strconv.ParseInt(items["isfirst"].(string), 10, 64)
+		updatecontacts := models.SpSupplierContacts{
+			ID:           id,
+			Name:         name,
+			Phone:        phone,
+			Address:      address,
+			IsFirst:      isfirst,
+			SupplierCode: supplierCode,
+			UserOrgId:    orgId,
+			Status:       1,
+			Ctime:        0,
+			Mtime:        time.Now().Unix(),
+		}
+		if id == 0 {
+			spcontacts := models.SpSupplierContacts{
+				Name:         name,
+				Phone:        phone,
+				Address:      address,
+				IsFirst:      isfirst,
+				SupplierCode: supplierCode,
+				UserOrgId:    orgId,
+				Status:       1,
+				Ctime:        time.Now().Unix(),
+				Mtime:        0,
+			}
+			err = SaveContacts(spcontacts, tx)
+			if err != nil {
+				return err
+			}
+		} else {
+			err = UpdateContact(updatecontacts, tx)
+		}
+		var tmpid int64
+		if isfirst == 1 {
+			if id == 0 {
+				var spconid []*models.SpSupplierContacts
+				spconid, err = SaveContactsId(tx)
+
+				if err != nil {
+					return err
+				}
+				tmpid = spconid[0].ID
+			} else {
+				tmpid = id
+			}
+			//更新供应商
+			upsupply := models.SpSupplierName{
+				ID:           suid,
+				SupplierCode: supplierCode,
+				SupplierName: supplierName,
+				SupplierType: supplierType,
+				VatRate:      vatRate,
+				Number:       number,
+				Bank:         bank,
+				BankAccount:  bankAccount,
+				UserOrgId:    orgId,
+				Status:       1,
+				ContactsId:   tmpid,
+				Mtime:        time.Now().Unix(),
+				Modify:       tcreater,
+			}
+			err = UpdateSupplyName(upsupply, tx)
+			if err != nil {
+				return err
+			}
+		}
+
+	}
+	return err
+}
+
+//更新一条供应商的信息
+func UpdateSupplyName(upsupply models.SpSupplierName, tx *gorm.DB) error {
+	err := tx.Model(&models.SpSupplierName{}).Where("id = ? and status = 1", upsupply.ID).Updates(map[string]interface{}{"supplier_code": upsupply.SupplierCode, "supplier_name": upsupply.SupplierName, "supplier_type": upsupply.SupplierType, "vat_rate": upsupply.VatRate, "number": upsupply.Number, "bank": upsupply.Bank, "bank_account": upsupply.BankAccount, "user_org_id": upsupply.UserOrgId, "status": upsupply.Status, "contacts_id": upsupply.ContactsId, "mtime": upsupply.Mtime, "modify": upsupply.Modify}).Error
+	return err
+}
+
+//更新一条联系人的信息
+func UpdateContact(updatecontacts models.SpSupplierContacts, tx *gorm.DB) error {
+	err := tx.Model(&models.SpSupplierContacts{}).Where("id = ? and status = 1", updatecontacts.ID).Updates(map[string]interface{}{"name": updatecontacts.Name, "phone": updatecontacts.Phone, "address": updatecontacts.Address, "is_first": updatecontacts.IsFirst, "supplier_code": updatecontacts.SupplierCode, "user_org_id": updatecontacts.UserOrgId, "status": updatecontacts.Status, "mtime": updatecontacts.Mtime}).Error
+	return err
+}
+
+//查询供应商单条记录
+func GetSupplyOne(id int64) (supply models.SpSupplierName, err error) {
+	err = XTReadDB().Model(&models.SpSupplierName{}).Where("id = ? and status = 1", id).First(&supply).Error
+	return supply, err
+}
+
+//删除单条联系人记录
+func DelContactOne(id int64) error {
+	err := XTWriteDB().Model(&models.SpSupplierContacts{}).Where("id = ?", id).Update("status", 0).Error
+	return err
+}
+
+//获取单条供应商和涉及到的联系人记录
+func GetSupplyAndContactOne(id int64) (supply models.SpSupplierName, contact []*models.SpSupplierContacts, err error) {
+	err = XTReadDB().Model(&models.SpSupplierName{}).Where("id = ? and status = 1", id).First(&supply).Error
+	code := supply.SupplierCode
+	err = XTReadDB().Model(&models.SpSupplierContacts{}).Where("supplier_code = ? and status = 1", code).Find(&contact).Error
+	return supply, contact, err
+}
+
 //删除供应商及联系人
 func DelSupply(supply models.SpSupplierName) error {
 	err := XTWriteDB().Model(&supply).Update("status", 0).Error
@@ -31,14 +183,15 @@ func SaveSupplyAndContact(thisStockIn []interface{}, orgId, supplierType, tcreat
 		isfirst, _ := strconv.ParseInt(items["isfirst"].(string), 10, 64)
 
 		spcontacts := models.SpSupplierContacts{
-			Name:      name,
-			Phone:     phone,
-			Address:   address,
-			IsFirst:   isfirst,
-			UserOrgId: orgId,
-			Status:    1,
-			Ctime:     time.Now().Unix(),
-			Mtime:     0,
+			Name:         name,
+			Phone:        phone,
+			Address:      address,
+			IsFirst:      isfirst,
+			SupplierCode: supplierCode,
+			UserOrgId:    orgId,
+			Status:       1,
+			Ctime:        time.Now().Unix(),
+			Mtime:        0,
 		}
 		err = SaveContacts(spcontacts, tx)
 		if isfirst == 1 {
@@ -82,7 +235,7 @@ func SaveSupplyAndContact(thisStockIn []interface{}, orgId, supplierType, tcreat
 //获取供应商编码
 func GetSuppliyCode() (spcode []*models.SpSupplierName, err error) {
 
-	err = XTReadDB().Model(&models.SpSupplierName{}).Select("supplier_code").Where("supplier_code like 'gys%' ").Order("supplier_code desc").First(&spcode).Error
+	err = XTReadDB().Model(&models.SpSupplierName{}).Select("supplier_code").Where("supplier_code like 'gys%' and status = 1 ").Order("supplier_code desc").First(&spcode).Error
 	return spcode, err
 }
 
@@ -98,6 +251,18 @@ func FindSupplierName(supplierName string) (sbool bool, err error) {
 	return sbool, err
 }
 
+//查询供应商的编号是否有重复
+func FindSupplierCode(supplierCode string) (codebool bool, err error) {
+	var total int
+	err = XTReadDB().Model(&models.SpSupplierName{}).Where("supplier_name = ? and status = 1", supplierCode).Count(&total).Error
+	if total != 0 {
+		codebool = true
+	} else {
+		codebool = false
+	}
+	return codebool, err
+}
+
 //保存一条供应商数据
 func SaveSupply(supply models.SpSupplierName, tx *gorm.DB) error {
 	err := tx.Create(&supply).Error
@@ -106,7 +271,7 @@ func SaveSupply(supply models.SpSupplierName, tx *gorm.DB) error {
 
 //获取联系人的id
 func SaveContactsId(tx *gorm.DB) (spconid []*models.SpSupplierContacts, err error) {
-	err = tx.Model(&models.SpSupplierContacts{}).Select("id").Order("id desc").First(&spconid).Error
+	err = tx.Model(&models.SpSupplierContacts{}).Select("id").Where("and status = 1").Order("id desc").First(&spconid).Error
 	return
 }