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

conf/app.conf

@@ -44,7 +44,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-mobile_token_expiration_second = 86400
+mobile_token_expiration_second = 604800
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com
 call_domain = https://hf.sgjyun.com
@@ -141,7 +141,7 @@ aliquid = 83
 
 
 [dev]
-mobile_token_expiration_second = 3600
+mobile_token_expiration_second = 604800
 httpdomain = http://new_mobile.xt.api.sgjyun.com
 sso_domain = https://testsso.sgjyun.com
 call_domain = http://hf.szjkhd.com

controllers/dialysis_api_controller.go

@@ -244,6 +244,8 @@ func (c *DialysisApiController) PostPrescription() {
 	//fmt.Println("下机前推注鱼精蛋白",push_the_protamine)
 	// var prescription_doctor int64
 	blood := c.GetString("blood")
+	dialysis_dialyszers := c.GetString("dialysis_dialyszers")
+	dialysis_irrigation := c.GetString("dialysis_irrigation")
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.CurrentOrgId)
 
@@ -322,7 +324,9 @@ func (c *DialysisApiController) PostPrescription() {
 		PreImpulse:                 preImpules,
 		AnticoagulantStopTimeHour:  anticoagulant_stop_time_hour,
 		AnticoagulantStopTimeMin:   anticoagulant_stop_time_min,
-		Blood: blood,
+		Blood:                      blood,
+		DialysisDialyszers:         dialysis_dialyszers,
+		DialysisIrrigation:         dialysis_irrigation,
 	}
 
 	if appRole.UserType == 2 || appRole.UserType == 1 {
@@ -489,6 +493,8 @@ func (c *DialysisApiController) PostSoulution() {
 	anticoagulant_stop_time_hour, _ := c.GetInt64("anticoagulant_stop_time_hour", 0)
 	anticoagulant_stop_time_min, _ := c.GetInt64("anticoagulant_stop_time_min", 0)
 	blood := c.GetString("blood")
+	dialysis_dialyszers := c.GetString("dialysis_dialyszers")
+	dialysis_irrigation := c.GetString("dialysis_irrigation")
 	var prescription_doctor int64
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentAppId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 
@@ -578,7 +584,9 @@ func (c *DialysisApiController) PostSoulution() {
 
 		AnticoagulantStopTimeHour: anticoagulant_stop_time_hour,
 		AnticoagulantStopTimeMin:  anticoagulant_stop_time_min,
-		Blood: blood,
+		Blood:                     blood,
+		DialysisIrrigation:        dialysis_irrigation,
+		DialysisDialyszers:        dialysis_dialyszers,
 	}
 
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(patient, recordDate.Unix(), adminUserInfo.CurrentOrgId)
@@ -1140,6 +1148,11 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 	urine_volume, _ := c.GetFloat("urine_volume", 0)
 	special_treatment := c.GetString("special_treatment")
 	catheter_maintenance := c.GetString("catheter_maintenance")
+	thrombusType := c.GetString("thromubus_type")
+	thrombusInt, _ := strconv.ParseInt(thrombusType, 10, 64)
+	thrombus_a := c.GetString("thromubus_a")
+	thrombus_av := c.GetString("thrombus_av")
+	thrombus_v := c.GetString("thromubus_v")
 	assessmentBeforeDislysis := models.PredialysisEvaluation{
 		DialysisCount:                  dialysis_count,
 		EmergencyTreatment:             emergency_treatment,
@@ -1197,6 +1210,10 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		UrineVolume:                    urine_volume,
 		SpecialTreatment:               special_treatment,
 		CatheterMaintenance:            catheter_maintenance,
+		ThromubusType:                  thrombusInt,
+		ThrombusAv:                     thrombus_av,
+		ThromubusA:                     thrombus_a,
+		ThromubusV:                     thrombus_v,
 	}
 
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
@@ -2297,6 +2314,7 @@ func (c *DialysisApiController) GetDialysisOrder() {
 	dialysisway, err := service.FindDialysisWay(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
 	//获取临时医嘱
 	doctorAdvice, _ := service.FindDoctorOrder(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
+	config, err := service.GetHisDoctorConfig(adminUserInfo.CurrentOrgId)
 
 	//获取医嘱内容
 	doctor, err := service.FindDoctor(doctorAdvice.AdviceDoctor, adminUserInfo.CurrentAppId, adminUserInfo.CurrentOrgId)
@@ -2349,38 +2367,79 @@ func (c *DialysisApiController) GetDialysisOrder() {
 	firstMonthDate := firstmonth.Unix()
 	//获取当前月份的病人透析次数
 	dialysiscount, err := service.GetDialysisCountByPatientId(firstMonthDate, xttime, patientInfo.ID, adminUserInfo.CurrentOrgId)
-	c.ServeSuccessJSON(map[string]interface{}{
-		"xtdate":                    xtdate,
-		"users":                     adminUser,
-		"patientInfo":               patientInfo,
-		"PredialysisEvaluation":     PredialysisEvaluation,
-		"AssessmentAfterDislysis":   AssessmentAfterDislysis,
-		"dialysisPrescription":      dialysisPrescription,
-		"advices":                   DoctorAdvice,
-		"monitors":                  Record,
-		"summary":                   TreatmentSummary,
-		"receiverTreatmentAccess":   receiverTreatmentAccess,
-		"dialysisOrder":             dialysisOrder,
-		"operators":                 operators,
-		"org_template_info":         templateInfo,
-		"check":                     check,
-		"schedule":                  schedule,
-		"dialysisway":               dialysisway,
-		"order":                     order,
-		"doctorAdvice":              doctorAdvice,
-		"doctor":                    doctor,
-		"nurse":                     nurse,
-		"doctorAdevieInfo":          doctorAdevieInfo,
-		"total":                     total,
-		"startNuse":                 startNuse,
-		"DoctorName":                DoctorName,
-		"assessmentAfterDislysis":   assessmentAfterDislysis,
-		"predialysName":             predialysName,
-		"FinishNuse":                FinishNuse,
-		"lastPredialysisEvaluation": lastPredialysisEvaluation,
-		"dialysiscount":             dialysiscount,
-		"last_order":                lastOrder,
-	})
+
+	//获取his数据
+	hisAdvice, err := service.GetHisDoctorPatientById(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
+	if config.IsOpen == 1 {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"xtdate":                    xtdate,
+			"users":                     adminUser,
+			"patientInfo":               patientInfo,
+			"PredialysisEvaluation":     PredialysisEvaluation,
+			"AssessmentAfterDislysis":   AssessmentAfterDislysis,
+			"dialysisPrescription":      dialysisPrescription,
+			"advices":                   hisAdvice,
+			"monitors":                  Record,
+			"summary":                   TreatmentSummary,
+			"receiverTreatmentAccess":   receiverTreatmentAccess,
+			"dialysisOrder":             dialysisOrder,
+			"operators":                 operators,
+			"org_template_info":         templateInfo,
+			"check":                     check,
+			"schedule":                  schedule,
+			"dialysisway":               dialysisway,
+			"order":                     order,
+			"doctorAdvice":              doctorAdvice,
+			"doctor":                    doctor,
+			"nurse":                     nurse,
+			"doctorAdevieInfo":          doctorAdevieInfo,
+			"total":                     total,
+			"startNuse":                 startNuse,
+			"DoctorName":                DoctorName,
+			"assessmentAfterDislysis":   assessmentAfterDislysis,
+			"predialysName":             predialysName,
+			"FinishNuse":                FinishNuse,
+			"lastPredialysisEvaluation": lastPredialysisEvaluation,
+			"dialysiscount":             dialysiscount,
+			"last_order":                lastOrder,
+		})
+
+	}
+	if config.IsOpen == 0 || config.IsOpen == 2 {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"xtdate":                    xtdate,
+			"users":                     adminUser,
+			"patientInfo":               patientInfo,
+			"PredialysisEvaluation":     PredialysisEvaluation,
+			"AssessmentAfterDislysis":   AssessmentAfterDislysis,
+			"dialysisPrescription":      dialysisPrescription,
+			"advices":                   DoctorAdvice,
+			"monitors":                  Record,
+			"summary":                   TreatmentSummary,
+			"receiverTreatmentAccess":   receiverTreatmentAccess,
+			"dialysisOrder":             dialysisOrder,
+			"operators":                 operators,
+			"org_template_info":         templateInfo,
+			"check":                     check,
+			"schedule":                  schedule,
+			"dialysisway":               dialysisway,
+			"order":                     order,
+			"doctorAdvice":              doctorAdvice,
+			"doctor":                    doctor,
+			"nurse":                     nurse,
+			"doctorAdevieInfo":          doctorAdevieInfo,
+			"total":                     total,
+			"startNuse":                 startNuse,
+			"DoctorName":                DoctorName,
+			"assessmentAfterDislysis":   assessmentAfterDislysis,
+			"predialysName":             predialysName,
+			"FinishNuse":                FinishNuse,
+			"lastPredialysisEvaluation": lastPredialysisEvaluation,
+			"dialysiscount":             dialysiscount,
+			"last_order":                lastOrder,
+		})
+
+	}
 
 }
 

controllers/dialysis_record_api_controller.go

@@ -268,6 +268,11 @@ func (this *DialysisRecordAPIController) DialysisSchedule() {
 
 	_, is_open_config := service.FindXTHisRecordByOrgId(adminInfo.CurrentOrgId)
 
+	//获取耗材类型
+	stockType, _ := service.GetStockType(adminInfo.CurrentOrgId)
+
+	prepare, _ := service.GetDialyStockOut(adminInfo.CurrentOrgId, date.Unix(), patientID)
+
 	var his_advices []*models.HisDoctorAdviceInfo
 	if is_open_config.IsOpen == 1 {
 		his_advices, _ = service.GetAllHisDoctorAdvice(adminInfo.CurrentOrgId, patientID, date.Unix())
@@ -299,6 +304,8 @@ func (this *DialysisRecordAPIController) DialysisSchedule() {
 		"system_prescribe":            systemDialysisPrescribe,
 		"his_advices":                 his_advices,
 		"is_open_config":              is_open_config,
+		"stockType":                   stockType,
+		"prepare":                     prepare,
 	}
 	this.ServeSuccessJSON(returnData)
 

controllers/doctors_api_controller.go

@@ -33,6 +33,8 @@ func (c *DoctorsApiController) ScheduleAdvices() {
 	schedualDate := c.GetString("date")
 	adviceType, _ := c.GetInt("advice_type")
 	patientType, _ := c.GetInt("patient_type")
+	delivery_way := c.GetString("delivery_way")
+
 	delivery_way := c.GetString("delivery_way")
 	if adviceType != 1 && adviceType != 3 && adviceType != 2 {
 		adviceType = 0

controllers/drug_stock_api_contorller.go

@@ -1417,7 +1417,7 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 					sys_record_time := int64(items["sys_record_time"].(float64))
 
 					warehouseOutInfo := &models.DrugWarehouseOutInfo{
-						ID: id,
+						ID:                      id,
 						WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 						WarehouseOutId:          warehouseOut.ID,
 						DrugId:                  drug_id,
@@ -1866,9 +1866,34 @@ func (c *StockDrugApiController) GetDrugQueryInfo() {
 	page, _ := c.GetInt64("page", -1)
 	limit, _ := c.GetInt64("limit", -1)
 	keyword := c.GetString("keyword")
+	drug_category, _ := c.GetInt64("drug_category")
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
 
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			fmt.Println(err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
 	adminUserInfo := c.GetAdminUserInfo()
-	list, total, err := service.FindAllDrugStockInfo(adminUserInfo.CurrentOrgId, page, limit, keyword)
+	list, total, err := service.FindAllDrugStockInfo(adminUserInfo.CurrentOrgId, page, limit, keyword, drug_category, startTime, endTime)
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
 			"list":  list,

controllers/his_api_controller.go

@@ -5,25 +5,18 @@ import (
 	"XT_New/models"
 	"XT_New/service"
 	"XT_New/utils"
-	"archive/zip"
 	"bytes"
 	"encoding/json"
 	"fmt"
 	"github.com/astaxie/beego"
 	"github.com/jinzhu/gorm"
-	"github.com/shopspring/decimal"
-	"io"
 	"io/ioutil"
 	"math/rand"
 	"net/http"
-	"os"
-	"path/filepath"
 	"reflect"
 	"strconv"
 	"strings"
-	"syscall"
 	"time"
-	"unsafe"
 )
 
 type HisApiController struct {
@@ -58,25 +51,22 @@ func HisManagerApiRegistRouters() {
 	beego.Router("/api/register/get", &HisApiController{}, "get:GetRegisterInfo")
 	beego.Router("/api/upload/get", &HisApiController{}, "get:GetUploadInfo")
 
-	beego.Router("/api/settle/query", &HisApiController{}, "get:GetSettleAccounts")
+	beego.Router("/api/refund/post", &HisApiController{}, "post:Refund")
 
-	beego.Router("/api/checkaccount/get", &HisApiController{}, "get:GetCheckAccount")
-	beego.Router("/api/checkdetailaccount/get", &HisApiController{}, "get:GetCheckDetailAccount")
+	beego.Router("/api/medicalinsurance/config", &HisApiController{}, "get:GetMedicalInsuranceConfig")
 
-	beego.Router("/api/checkdetailaccount/get", &HisApiController{}, "get:GetCheckDetailAccount")
+	beego.Router("/api/doctor/list", &HisApiController{}, "get:GetAdminUsers")
 
-	beego.Router("/api/refund/post", &HisApiController{}, "get:Refund")
+	//beego.Router("/api/medicalinsurance/config", &HisApiController{}, "get:GetMedicalInsuranceConfig")
 
-	beego.Router("/api/medicalinsurance/config", &HisApiController{}, "get:GetMedicalInsuranceConfig")
+	//新增附加费用
+	//beego.Router("/api/his/additionalcharge", &HisApiController{}, "Post:AdditionalCharge")
 
-	beego.Router("/api/doctor/list", &HisApiController{}, "get:GetAdminUsers")
+	//beego.Router("/api/additionalcharge/get", &HisApiController{}, "Get:GetAdditionalcharge")
 
 	beego.Router("/api/hisprescription/get", &DialysisApiController{}, "Get:GetLastOrNextHisPrescription")
 
 	beego.Router("/api/callhisprescription/get", &DialysisApiController{}, "Get:GetCallHisPrescription")
-	beego.Router("/api/sscard", &HisApiController{}, "get:Sscard")
-
-}
 
 func (c *HisApiController) Sscard() {
 	//r := CardInit()
@@ -659,7 +649,7 @@ func (c *HisApiController) CreateHisPatientCaseHistory() {
 
 	blood_fat := c.GetString("blood_fat")
 	bloodfatfloat, _ := strconv.ParseFloat(blood_fat, 64)
-	//fmt.Println("33333333", bloodfatfloat)
+	fmt.Println("33333333", bloodfatfloat)
 	blood_sugar := c.GetString("blood_sugar")
 	bloodsugarfloat, _ := strconv.ParseFloat(blood_sugar, 64)
 	fmt.Println(bloodsugarfloat)
@@ -1026,18 +1016,17 @@ func (c *HisApiController) setProjectWithJSON(project *models.HisPrescriptionPro
 		fmt.Println(project_id)
 		fmt.Println(project.ProjectId)
 	}
-	//if json["price"] != nil || reflect.TypeOf(json["price"]).String() == "float64" {
-	//	//price := int64(json["price"].(float64))
-	//	//fmt.Println("price--------------------------",price)
-	//	//formatInt_price := strconv.FormatInt(price, 10)
-	//	//float_price, _ := strconv.ParseFloat(formatInt_price, 64)
-	//	//project.Price = float_price
-	//
-	//}
+	// if json["price"] != nil || reflect.TypeOf(json["price"]).String() == "float64" {
+	// 	price := int64(json["price"].(float64))
+	// 	formatInt_price := strconv.FormatInt(price, 10)
+	// 	float_price, _ := strconv.ParseFloat(formatInt_price, 64)
+	// 	project.Price = float_price
+	// }
 	if json["price"] != nil || reflect.TypeOf(json["price"]).String() == "string" {
 		price, _ := strconv.ParseFloat(json["price"].(string), 64)
 		project.Price = price
 	}
+
 	if json["total"] != nil && reflect.TypeOf(json["total"]).String() == "string" {
 		total, _ := json["total"].(string)
 		totals, _ := strconv.ParseInt(total, 10, 64)
@@ -1092,6 +1081,12 @@ func (c *HisApiController) setAddtionWithJSON(additionalCharge *models.HisAdditi
 			}
 		}
 	}
+	// if json["price"] != nil || reflect.TypeOf(json["price"]).String() == "float64" {
+	// 	price := int64(json["price"].(float64))
+	// 	formatInt_price := strconv.FormatInt(price, 10)
+	// 	float_price, _ := strconv.ParseFloat(formatInt_price, 64)
+	// 	additionalCharge.Price = float_price
+	// }
 
 	//if json["price"] != nil || reflect.TypeOf(json["price"]).String() == "float64" {
 	//	price := int64(json["price"].(float64))
@@ -1336,7 +1331,6 @@ type ResultSix struct {
 	Signtype    interface{} `json:"signtype"`
 	WarnMsg     interface{} `json:"warn_msg"`
 }
-
 type ResultSeven struct {
 	Cainfo      string `json:"cainfo"`
 	ErrMsg      string `json:"err_msg"`
@@ -1362,14 +1356,13 @@ type ResultSeven struct {
 			Gend            string  `json:"gend"`
 			HifesPay        float64 `json:"hifes_pay"`
 			HifmiPay        float64 `json:"hifmi_pay"`
+			HifobPay        float64 `json:"hifob_pay"`
 			HifpPay         float64 `json:"hifp_pay"`
 			HospPartAmt     float64 `json:"hosp_part_amt"`
 			InscpScpAmt     float64 `json:"inscp_scp_amt"`
 			Insutype        string  `json:"insutype"`
 			MafPay          float64 `json:"maf_pay"`
 			MdtrtCertType   string  `json:"mdtrt_cert_type"`
-			HifobPay        float64 `json:"hifob_pay"`
-
 			MdtrtID         string  `json:"mdtrt_id"`
 			MedType         string  `json:"med_type"`
 			MedfeeSumamt    float64 `json:"medfee_sumamt"`
@@ -1556,7 +1549,7 @@ func (c *HisApiController) GetRegisterInfo() {
 
 	if config.IsOpen == 1 {
 
-		api := "http://127.0.0.1:9532/" + "gdyb/one?cert_no=" + patient.IdCardNo + "&org_name=" + miConfig.OrgName + "&doctor=" + patientPrescription.Doctor + "&fixmedins_code=" + miConfig.Code + "&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
+		api := "http://127.0.0.1:9531/" + "gdyb/one?cert_no=" + patient.IdCardNo + "&org_name=" + miConfig.OrgName + "&doctor=" + patientPrescription.Doctor + "&fixmedins_code=" + miConfig.Code + "&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
 		resp, requestErr := http.Get(api)
 
 		if requestErr != nil {
@@ -1639,7 +1632,7 @@ func (c *HisApiController) GetRegisterInfo() {
 		doctor_id := strconv.FormatInt(patientPrescription.DoctorId, 10)
 
 		if count <= 0 {
-			api := "http://127.0.0.1:9532/" + "gdyb/two?cert_no=" + patient.IdCardNo + "&insutype=" +
+			api := "http://127.0.0.1:9531/" + "gdyb/two?cert_no=" + patient.IdCardNo + "&insutype=" +
 				res.Output.Iinfo[0].Insutype + "&psn_no=" + res.Output.Baseinfo.PsnNo +
 				"&org_name=" + miConfig.OrgName + "&doctor=" + patientPrescription.Doctor + "&ipt_otp_no=" + ipt_otp_no +
 				"&dept=" + department.Name + "&fixmedins_code=" + miConfig.Code + "&dept_code=" + department.Number + "&doctor_id=" + doctor_id + "&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
@@ -1694,9 +1687,9 @@ func (c *HisApiController) GetRegisterInfo() {
 			diagnosisConfig, _ := service.FindDiagnoseById(patientPrescription.Diagnosis)
 
 			if err == nil {
-				api := "http://127.0.0.1:9532/" + "gdyb/four?psn_no=" + his.PsnNo +
+				api := "http://127.0.0.1:9531/" + "gdyb/four?psn_no=" + his.PsnNo +
 					"&mdtrt_id=" + his.Number + "&doctor=" + patientPrescription.Doctor + "&department=" + department.Name +
-					"&diag=" + diagnosisConfig.ClassName + "&org_name=" + miConfig.OrgName + "&med_type=" + strconv.FormatInt(patientPrescription.RegisterType, 10) + "&doctor_id=" + strconv.FormatInt(patientPrescription.DoctorId, 10) + "&fixmedins_code=" + miConfig.Code + "&diag_code=" + diagnosisConfig.CountryCode +
+					"&diag=" + diagnosisConfig.ClassName + "&org_name=" + miConfig.OrgName + "&med_type=" + "11" + "&doctor_id=" + strconv.FormatInt(patientPrescription.DoctorId, 10) + "&fixmedins_code=" + miConfig.Code + "&diag_code=" + diagnosisConfig.CountryCode +
 					"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
 				resp, requestErr := http.Get(api)
 				if requestErr != nil {
@@ -1781,7 +1774,9 @@ func (c *HisApiController) GetRegisterInfo() {
 		c.ServeSuccessJSON(map[string]interface{}{
 			"his_info": hisPatient,
 		})
+
 	}
+
 }
 
 //上传明细----结算
@@ -1833,9 +1828,7 @@ func (c *HisApiController) GetUploadInfo() {
 	data["chrg_bchno"] = chrg_bchno
 	data["org_name"] = miConfig.OrgName
 	data["doctor"] = patientPrescription.Doctor
-	data["doctor_id"] = strconv.FormatInt(patientPrescription.DoctorId, 10)
-
-	data["dept"] = strconv.FormatInt(patientPrescription.Departments, 10)
+	data["dept"] = patientPrescription.Departments
 
 	data["fixmedins_code"] = miConfig.Code
 	data["dept_code"] = department.Number
@@ -1843,21 +1836,6 @@ func (c *HisApiController) GetUploadInfo() {
 	data["mdtrtarea_admvs"] = miConfig.MdtrtareaAdmvs
 	data["secret_key"] = miConfig.SecretKey
 
-	fmt.Println(his.PsnNo)
-	fmt.Println(his.Number)
-
-	fmt.Println(miConfig.OrgName)
-
-	fmt.Println(chrg_bchno)
-	fmt.Println(patientPrescription.Doctor)
-	fmt.Println(miConfig.Code)
-	fmt.Println(department.Number)
-	fmt.Println(strconv.FormatInt(patientPrescription.Departments, 10))
-
-	fmt.Println(miConfig.InsuplcAdmdvs)
-	fmt.Println(miConfig.MdtrtareaAdmvs)
-	fmt.Println(miConfig.SecretKey)
-
 	var ids []int64
 	//var idsTwo []int64
 	//
@@ -1869,7 +1847,7 @@ func (c *HisApiController) GetUploadInfo() {
 
 	if config.IsOpen == 1 { //对接了医保，走医保流程
 		bytesData, _ := json.Marshal(data)
-		req, _ := http.NewRequest("POST", "http://127.0.0.1:9532/"+"gdyb/five", bytes.NewReader(bytesData))
+		req, _ := http.NewRequest("POST", "http://127.0.0.1:9531/"+"gdyb/five", bytes.NewReader(bytesData))
 		resp, _ := client.Do(req)
 		defer resp.Body.Close()
 		body, ioErr := ioutil.ReadAll(resp.Body)
@@ -1920,7 +1898,6 @@ func (c *HisApiController) GetUploadInfo() {
 				FoundPrice:            found_price,
 				MedicalInsurancePrice: medical_insurance_price,
 				PrivatePrice:          private_price,
-				IsMedicineInsurance:   1,
 			}
 			err = service.CreateOrder(order)
 			if err != nil {
@@ -1995,7 +1972,7 @@ func (c *HisApiController) GetUploadInfo() {
 					}
 				}
 			}
-			//org, _ := service.GetOrgById(adminUser.CurrentOrgId)
+			org, _ := service.GetOrgById(adminUser.CurrentOrgId)
 			patientPrescription, _ := service.FindPatientPrescriptionInfo(adminUser.CurrentOrgId, id, recordDateTime)
 			allTotal := fmt.Sprintf("%.2f", total)
 			if res.Infcode == 0 {
@@ -2006,9 +1983,9 @@ func (c *HisApiController) GetUploadInfo() {
 				chrg_bchno := chrg_bchno
 				cert_no := his.Certno
 				insutype := rf[0].Insutype
-				api := "http://127.0.0.1:9532/" + "gdyb/eight?cert_no=" + cert_no + "&insutype=" +
+				api := "http://127.0.0.1:9531/" + "gdyb/eight?cert_no=" + cert_no + "&insutype=" +
 					insutype + "&psn_no=" + psn_no + "&chrg_bchno=" + chrg_bchno + "&mdtrt_id=" + mdtrt_id +
-					"&total=" + allTotal + "&org_name=" + miConfig.OrgName + "&doctor=" + patientPrescription.Doctor + "&fixmedins_code=" + miConfig.Code + "&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
+					"&total=" + allTotal + "&org_name=" + org.OrgName + "&doctor=" + patientPrescription.Doctor + "&fixmedins_code=" + miConfig.Code + "&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
 				resp, requestErr := http.Get(api)
 
 				if requestErr != nil {
@@ -2105,8 +2082,7 @@ func (c *HisApiController) GetUploadInfo() {
 					}
 				}
 			} else {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCalOrderException)
-				return
+
 			}
 
 		} else {
@@ -2278,108 +2254,11 @@ func (c *HisApiController) GetUploadInfo() {
 func (c *HisApiController) Refund() {
 	order_id, _ := c.GetInt64("order_id")
 	number := c.GetString("number")
-	record_time := c.GetString("record_time")
-	patient_id, _ := c.GetInt64("patient_id")
-
-	timeLayout := "2006-01-02"
-	loc, _ := time.LoadLocation("Local")
 
 	adminUser := c.GetAdminUserInfo()
-	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_time+" 00:00:00", loc)
-	fmt.Println(err)
-	if err != nil {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
-	}
-	recordDateTime := theTime.Unix()
-
-	his, _ := service.GetVMHisPatientInfo(adminUser.CurrentOrgId, patient_id, recordDateTime)
-	patientPrescription, _ := service.FindPatientPrescriptionInfo(adminUser.CurrentOrgId, patient_id, recordDateTime)
-	order, _ := service.GetHisOrderByID(order_id)
-
-	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
 	config, _ := service.GetMedicalInsuranceConfig(adminUser.CurrentOrgId)
 	if config.IsOpen == 1 { //对接了医保，走医保流程
-		api := "http://127.0.0.1:9532/" + "gdyb/nine?psn_no=" + his.PsnNo +
-			"&mdtrt_id=" + his.Number + "&doctor=" + patientPrescription.Doctor + "&setl_id=" + order.SetlId + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
-			"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
-		resp, requestErr := http.Get(api)
-		if requestErr != nil {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
-		body, ioErr := ioutil.ReadAll(resp.Body)
-		if ioErr != nil {
-			utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
-		var respJSON map[string]interface{}
-		if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
-			utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
-		respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
-		userJSONBytes, _ := json.Marshal(respJSON)
-		fmt.Println(respJSON)
-		fmt.Println(userJSONBytes)
-
-		api2 := "http://127.0.0.1:9532/" + "gdyb/six?psn_no=" + his.PsnNo +
-			"&mdtrt_id=" + his.Number + "&chrg_bchno=" + order.Number + "&doctor=" + patientPrescription.Doctor + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
-			"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
-		resp2, requestErr2 := http.Get(api2)
-		if requestErr2 != nil {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
-
-		body2, ioErr2 := ioutil.ReadAll(resp2.Body)
-		if ioErr2 != nil {
-			utils.ErrorLog("接口返回数据读取失败: %v", ioErr2)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
-		var respJSON2 map[string]interface{}
-		if err := json.Unmarshal([]byte(string(body2)), &respJSON2); err != nil {
-			utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
-
-		api3 := "http://127.0.0.1:9532/" + "gdyb/three?psn_no=" + his.PsnNo +
-			"&mdtrt_id=" + his.Number + "&ipt_otp_no=" + his.IptOtpNo + "&doctor=" + patientPrescription.Doctor + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
-			"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
-		resp3, requestErr3 := http.Get(api3)
-		if requestErr3 != nil {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
-
-		body3, ioErr3 := ioutil.ReadAll(resp3.Body)
-		if ioErr3 != nil {
-			utils.ErrorLog("接口返回数据读取失败: %v", ioErr3)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
-		var respJSON3 map[string]interface{}
-		if err := json.Unmarshal([]byte(string(body3)), &respJSON3); err != nil {
-			utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
-
-		err := service.UpdataOrderStatus(order_id, number, adminUser.CurrentOrgId)
-		service.UpdataRegStatus(patient_id, recordDateTime, adminUser.CurrentOrgId)
 
-		if err == nil {
-			c.ServeSuccessJSON(map[string]interface{}{
-				"msg": "退费成功",
-			})
-		} else {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
 	} else {
 		err := service.UpdataOrderStatus(order_id, number, adminUser.CurrentOrgId)
 		if err == nil {
@@ -2390,462 +2269,7 @@ func (c *HisApiController) Refund() {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 			return
 		}
-	}
-}
-
-//对账
-func (c *HisApiController) GetCheckAccount() {
-	start_time := c.GetString("start_time")
-	end_time := c.GetString("end_time")
-	insutype := c.GetString("insutype")
-	clr_type := c.GetString("clr_type")
-
-	adminUser := c.GetAdminUserInfo()
-	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
-	config, _ := service.GetMedicalInsuranceConfig(adminUser.CurrentOrgId)
-
-	timeLayout := "2006-01-02"
-	loc, _ := time.LoadLocation("Local")
-	startime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
-	endtime, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
-	orders, _ := service.GetOrderByTime(startime.Unix(), endtime.Unix(), adminUser.CurrentOrgId, insutype, clr_type)
-
-	decimal.DivisionPrecision = 2
-	var medfee_sumamt float64
-	var acct_pay float64
-	var fund_pay_sumamt float64
-	fixmedins_setl_cnt := int64(len(orders))
-
-	for _, item := range orders {
-		medfee_sumamt, _ = decimal.NewFromFloat(medfee_sumamt).Add(decimal.NewFromFloat(item.MedfeeSumamt)).Float64()
-		acct_pay, _ = decimal.NewFromFloat(acct_pay).Add(decimal.NewFromFloat(item.AcctPay)).Float64()
-		fund_pay_sumamt, _ = decimal.NewFromFloat(fund_pay_sumamt).Add(decimal.NewFromFloat(item.FundPaySumamt)).Float64()
-
-	}
-
-	var user_name string
-	role, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, adminUser.AdminUser.Id)
-	if role.ID == 0 {
-		user_name = "xxx"
-	} else {
-		user_name = role.UserName
-	}
-
-	if config.IsOpen == 1 {
-		api := "http://127.0.0.1:9532/" + "gdyb/ten?" +
-			"insutype=" + insutype +
-			"&clr_type=" + clr_type +
-			"&setl_optins=" + miConfig.OrgName +
-			"&stmt_begndate=" + start_time +
-			"&stm_enddate=" + end_time +
-			"&medfee_sumamt=" + fmt.Sprintf("%.2f", medfee_sumamt) +
-			"&fund_pay_sumamt=" + fmt.Sprintf("%.2f", fund_pay_sumamt) +
-			"&acct_pay=" + fmt.Sprintf("%.2f", acct_pay) +
-			"&fixmedins_setl_cnt=" + strconv.FormatInt(fixmedins_setl_cnt, 10) +
-			"&fixmedins_code=" + miConfig.Code +
-			"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs +
-			"&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
-			"&secret_key=" + miConfig.SecretKey +
-			"&org_name=" + miConfig.OrgName +
-			"&doctor=" + user_name
-
-		fmt.Println(api)
-		resp, requestErr := http.Get(api)
-		if requestErr != nil {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
-		body, ioErr := ioutil.ReadAll(resp.Body)
-		fmt.Println(body)
-		if ioErr != nil {
-			utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
-		var respJSON map[string]interface{}
-		if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
-			utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
-
-		respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
-		userJSONBytes, _ := json.Marshal(respJSON)
-
-		var res ResultEight
-		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-			utils.ErrorLog("解析失败：%v", err)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
-		if res.Infcode == 0 {
-			c.ServeSuccessJSON(map[string]interface{}{
-				"stmt_rslt":      res.Output.Stmtinfo.StmtRslt,
-				"stmt_rslt_dscr": res.Output.Stmtinfo.StmtRsltDscr,
-			})
-		} else {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		}
-	}
-}
-
-//对账明细
-func (c *HisApiController) GetCheckDetailAccount() {
-	start_time := c.GetString("start_time")
-	end_time := c.GetString("end_time")
-
-	adminUser := c.GetAdminUserInfo()
-	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
-	config, _ := service.GetMedicalInsuranceConfig(adminUser.CurrentOrgId)
-
-	timeLayout := "2006-01-02"
-	loc, _ := time.LoadLocation("Local")
-	startime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
-	endtime, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
-	orders, _ := service.GetOrderByTimeTwo(startime.Unix(), endtime.Unix(), adminUser.CurrentOrgId)
-
-	Mkdir(miConfig.OrgName)
-	file := strconv.FormatInt(adminUser.CurrentOrgId, 10) + strconv.FormatInt(time.Now().Unix(), 10)
-	file_name := file + ".txt"
-	zip_name := file + ".zip"
-	zip_path := miConfig.OrgName + "/" + zip_name
-	file_path := miConfig.OrgName + "/" + file_name
-
-	decimal.DivisionPrecision = 2
-	var medfee_sumamt float64
-	var psn_cash_pay float64
-	var fund_pay_sumamt float64
-	fixmedins_setl_cnt := int64(len(orders))
-
-	for _, item := range orders {
-		medfee_sumamt, _ = decimal.NewFromFloat(medfee_sumamt).Add(decimal.NewFromFloat(item.MedfeeSumamt)).Float64()
-		psn_cash_pay, _ = decimal.NewFromFloat(psn_cash_pay).Add(decimal.NewFromFloat(item.PsnCashPay)).Float64()
-		fund_pay_sumamt, _ = decimal.NewFromFloat(fund_pay_sumamt).Add(decimal.NewFromFloat(item.FundPaySumamt)).Float64()
-	}
-
-	f, err := os.Create(miConfig.OrgName + "/" + file_name)
-	defer f.Close()
-	if err != nil {
-		fmt.Println(err.Error())
-	} else {
-		for _, item := range orders {
-			var refd_setl_flag string
-			if item.OrderStatus == 2 {
-				refd_setl_flag = "0"
-			}
-			if item.OrderStatus == 3 {
-				refd_setl_flag = "1"
-			}
-			var str string
-			str = item.SetlId + "	" +
-				item.MdtrtId + "	" +
-				item.PsnNo + "	" +
-				fmt.Sprintf("%.2f", item.MedfeeSumamt) + "	" +
-				fmt.Sprintf("%.2f", item.FundPaySumamt) + "	" +
-				fmt.Sprintf("%.2f", item.AcctPay) + "	" + refd_setl_flag + "\n"
-			_, err = f.Write([]byte(str))
-		}
-
-	}
-	Zip(file_path, zip_path)
-	fmt.Println(ReadFile(zip_path))
-	fmt.Println(string(ReadFile(zip_path)))
-
-	if config.IsOpen == 1 {
-
-		var user_name string
-		role, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, adminUser.AdminUser.Id)
-		if role.ID == 0 {
-			user_name = "xxx"
-		} else {
-			user_name = role.UserName
-		}
-
-		baseParams := models.BaseParams{
-			SecretKey:      miConfig.SecretKey,
-			FixmedinsCode:  miConfig.Code,
-			InsuplcAdmdvs:  miConfig.InsuplcAdmdvs,
-			MdtrtareaAdmvs: miConfig.MdtrtareaAdmvs,
-			OrgName:        miConfig.OrgName,
-			Doctor:         user_name,
-		}
-
-		result := service.Gdyb9101(baseParams, zip_name, ReadFile(zip_path))
-
-		var dat map[string]interface{}
-		if err := json.Unmarshal([]byte(result), &dat); err == nil {
-			fmt.Println(dat)
-		} else {
-			fmt.Println(err)
-		}
-
-		userJSONBytes, _ := json.Marshal(dat)
-
-		var res ResultNine
-		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-			utils.ErrorLog("解析失败：%v", err)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
-		if res.Infcode == 0 {
-			api := "http://127.0.0.1:9532/" + "gdyb/twelve?" +
-				"file_qury_no=" + res.Output.FileQuryNo +
-				"&setl_optins=" + miConfig.OrgName +
-				"&stmt_begndate=" + start_time +
-				"&stm_enddate=" + end_time +
-				"&medfee_sumamt=" + fmt.Sprintf("%.2f", medfee_sumamt) +
-				"&fund_pay_sumamt=" + fmt.Sprintf("%.2f", fund_pay_sumamt) +
-				"&cash_payamt=" + fmt.Sprintf("%.2f", psn_cash_pay) +
-				"&fixmedins_setl_cnt=" + strconv.FormatInt(fixmedins_setl_cnt, 10) +
-				"&fixmedins_code=" + miConfig.Code +
-				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs +
-				"&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
-				"&secret_key=" + miConfig.SecretKey +
-				"&org_name=" + miConfig.OrgName +
-				"&doctor=" + user_name
-			resp, requestErr := http.Get(api)
-			if requestErr != nil {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
-			}
-			body, ioErr := ioutil.ReadAll(resp.Body)
-			if ioErr != nil {
-				utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
-			}
-			var respJSON map[string]interface{}
-			if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
-				utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
-			}
-			respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
-
-			userJSONBytes, _ := json.Marshal(respJSON)
-			var res ResultTen
-			if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-				utils.ErrorLog("解析失败：%v", err)
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
-			}
 
-			if res.Infcode == 0 {
-				service.Gdyb9102(baseParams, zip_name, res.Output.FileQuryNo)
-				c.ServeSuccessJSON(map[string]interface{}{
-					"msg": "明细对账成功",
-				})
-			}
-
-		} else {
-
-		}
-	}
-}
-
-func (c *HisApiController) GetSettleAccounts() {
-	//id, _ := c.GetInt64("id")
-	//record_time := c.GetString("record_time")
-	order_id, _ := c.GetInt64("order_id")
-
-	//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()
-	//his, _ := service.GetVMHisPatientInfo(adminUser.CurrentOrgId, id, recordDateTime)
-	order, _ := service.GetHisOrderByID(order_id)
-	orderInfos, _ := service.GetHisOrderInfoByNumber(order.Number)
-
-	var bedCostTotal float64 = 0         //床位总费
-	var bedCostSelfTotal float64 = 0     //床位自费
-	var bedCostPartSelfTotal float64 = 0 //床位部分项目自费
-
-	var operationCostTotal float64 = 0         //手术费
-	var operationCostSelfTotal float64 = 0     //手术费
-	var operationCostPartSelfTotal float64 = 0 //手术费
-
-	var otherCostTotal float64 = 0         //其他费用
-	var otherCostSelfTotal float64 = 0     //其他费用
-	var otherCostPartSelfTotal float64 = 0 //其他费用
-
-	var materialCostTotal float64 = 0         //材料费
-	var materialCostSelfTotal float64 = 0     //材料费
-	var materialCostPartSelfTotal float64 = 0 //材料费
-
-	var westernMedicineCostTotal float64 = 0         //西药费
-	var westernMedicineCostSelfTotal float64 = 0     //西药费
-	var westernMedicineCostPartSelfTotal float64 = 0 //西药费
-
-	var chineseTraditionalMedicineCostTotal float64 = 0         //中成药
-	var chineseTraditionalMedicineCostSelfTotal float64 = 0     //中成药
-	var chineseTraditionalMedicineCostPartSelfTotal float64 = 0 //中成药
-
-	var checkCostTotal float64 = 0         //检查费
-	var checkCostSelfTotal float64 = 0     //检查费
-	var checkCostPartSelfTotal float64 = 0 //检查费
-
-	var laboratoryCostTotal float64 = 0         //化验费
-	var laboratoryCostSelfTotal float64 = 0     //化验费
-	var laboratoryCostPartSelfTotal float64 = 0 //化验费
-
-	var treatCostTotal float64 = 0         //治疗费用
-	var treatCostSelfTotal float64 = 0     //治疗费用
-	var treatCostPartSelfTotal float64 = 0 //治疗费用
-
-	decimal.DivisionPrecision = 2
-
-	for _, item := range orderInfos {
-		if item.MedChrgitmType == "01" { //床位费
-
-			bedCostTotal, _ = decimal.NewFromFloat(bedCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-			bedCostSelfTotal, _ = decimal.NewFromFloat(bedCostSelfTotal).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
-			bedCostPartSelfTotal, _ = decimal.NewFromFloat(bedCostPartSelfTotal).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
-
-		}
-
-		if item.MedChrgitmType == "03" { //检查费
-
-			checkCostTotal, _ = decimal.NewFromFloat(checkCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-			checkCostSelfTotal, _ = decimal.NewFromFloat(checkCostSelfTotal).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
-			checkCostPartSelfTotal, _ = decimal.NewFromFloat(checkCostPartSelfTotal).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
-
-		}
-
-		if item.MedChrgitmType == "04" { //化验费
-
-			laboratoryCostTotal, _ = decimal.NewFromFloat(laboratoryCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-			laboratoryCostSelfTotal, _ = decimal.NewFromFloat(laboratoryCostSelfTotal).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
-			laboratoryCostPartSelfTotal, _ = decimal.NewFromFloat(laboratoryCostPartSelfTotal).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
-
-		}
-
-		if item.MedChrgitmType == "05" { //治疗费
-
-			treatCostTotal, _ = decimal.NewFromFloat(treatCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-			treatCostSelfTotal, _ = decimal.NewFromFloat(treatCostSelfTotal).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
-			treatCostPartSelfTotal, _ = decimal.NewFromFloat(treatCostPartSelfTotal).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
-
-		}
-
-		if item.MedChrgitmType == "06" { //手术费
-
-			operationCostTotal, _ = decimal.NewFromFloat(operationCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-			operationCostSelfTotal, _ = decimal.NewFromFloat(operationCostSelfTotal).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
-			operationCostPartSelfTotal, _ = decimal.NewFromFloat(operationCostPartSelfTotal).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
-
-		}
-
-		if item.MedChrgitmType == "08" { //材料费
-
-			materialCostTotal, _ = decimal.NewFromFloat(materialCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-			materialCostSelfTotal, _ = decimal.NewFromFloat(materialCostSelfTotal).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
-			materialCostPartSelfTotal, _ = decimal.NewFromFloat(materialCostPartSelfTotal).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
-
-		}
-
-		if item.MedChrgitmType == "09" { //西药费
-
-			westernMedicineCostTotal, _ = decimal.NewFromFloat(westernMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-			westernMedicineCostSelfTotal, _ = decimal.NewFromFloat(westernMedicineCostSelfTotal).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
-			westernMedicineCostPartSelfTotal, _ = decimal.NewFromFloat(westernMedicineCostPartSelfTotal).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
-
-		}
-
-		if item.MedChrgitmType == "11" { //中成费
-
-			chineseTraditionalMedicineCostTotal, _ = decimal.NewFromFloat(chineseTraditionalMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-			chineseTraditionalMedicineCostSelfTotal, _ = decimal.NewFromFloat(chineseTraditionalMedicineCostSelfTotal).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
-			chineseTraditionalMedicineCostPartSelfTotal, _ = decimal.NewFromFloat(chineseTraditionalMedicineCostPartSelfTotal).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
-
-		}
-
-		if item.MedChrgitmType == "14" { //其他费
-			otherCostTotal, _ = decimal.NewFromFloat(otherCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-			otherCostSelfTotal, _ = decimal.NewFromFloat(otherCostSelfTotal).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
-			otherCostPartSelfTotal, _ = decimal.NewFromFloat(otherCostPartSelfTotal).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
-		}
-
-	}
-
-	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
-	config, _ := service.GetMedicalInsuranceConfig(adminUser.CurrentOrgId)
-
-	var user_name string
-	role, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, adminUser.AdminUser.Id)
-	if role.ID == 0 {
-		user_name = "xxx"
-	} else {
-		user_name = role.UserName
-	}
-
-	baseParams := models.BaseParams{
-		SecretKey:      miConfig.SecretKey,
-		FixmedinsCode:  miConfig.Code,
-		InsuplcAdmdvs:  miConfig.InsuplcAdmdvs,
-		MdtrtareaAdmvs: miConfig.MdtrtareaAdmvs,
-		OrgName:        miConfig.OrgName,
-		Doctor:         user_name,
-	}
-
-	businessParams := models.BusinessParams{
-		PsnNo:   order.PsnNo,
-		MdtrtId: order.MdtrtId,
-		SetlId:  order.SetlId,
-	}
-
-	if config.IsOpen == 1 {
-		result := service.Gdyb5203(baseParams, businessParams)
-		var dat map[string]interface{}
-		if err := json.Unmarshal([]byte(result), &dat); err == nil {
-			fmt.Println(dat)
-		} else {
-			fmt.Println(err)
-		}
-		userJSONBytes, _ := json.Marshal(dat)
-		var res ResultEleven
-		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-			utils.ErrorLog("解析失败：%v", err)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
-		if res.Infcode == 0 {
-			c.ServeSuccessJSON(map[string]interface{}{
-				"info":                                        res.Output.Setlinfo,
-				"bedCostTotal":                                bedCostTotal,
-				"bedCostSelfTotal":                            bedCostSelfTotal,
-				"bedCostPartSelfTotal":                        bedCostPartSelfTotal,
-				"operationCostTotal":                          operationCostTotal,
-				"operationCostSelfTotal":                      operationCostSelfTotal,
-				"operationCostPartSelfTotal":                  operationCostPartSelfTotal,
-				"otherCostTotal":                              otherCostTotal,
-				"otherCostSelfTotal":                          otherCostSelfTotal,
-				"otherCostPartSelfTotal":                      otherCostPartSelfTotal,
-				"materialCostTotal":                           materialCostTotal,
-				"materialCostSelfTotal":                       materialCostSelfTotal,
-				"materialCostPartSelfTotal":                   materialCostPartSelfTotal,
-				"westernMedicineCostTotal":                    westernMedicineCostTotal,
-				"westernMedicineCostSelfTotal":                westernMedicineCostSelfTotal,
-				"westernMedicineCostPartSelfTotal":            westernMedicineCostPartSelfTotal,
-				"chineseTraditionalMedicineCostTotal":         chineseTraditionalMedicineCostTotal,
-				"chineseTraditionalMedicineCostSelfTotal":     chineseTraditionalMedicineCostSelfTotal,
-				"chineseTraditionalMedicineCostPartSelfTotal": chineseTraditionalMedicineCostPartSelfTotal,
-				"checkCostTotal":                              checkCostTotal,
-				"checkCostSelfTotal":                          checkCostSelfTotal,
-				"checkCostPartSelfTotal":                      checkCostPartSelfTotal,
-				"laboratoryCostTotal":                         laboratoryCostTotal,
-				"laboratoryCostSelfTotal":                     laboratoryCostSelfTotal,
-				"laboratoryCostPartSelfTotal":                 laboratoryCostPartSelfTotal,
-				"treatCostTotal":                              treatCostTotal,
-				"treatCostSelfTotal":                          treatCostSelfTotal,
-				"treatCostPartSelfTotal":                      treatCostPartSelfTotal,
-			})
-		}
 	}
 
 }
@@ -2984,100 +2408,3 @@ func (this *DialysisApiController) GetCallHisPrescription() {
 		return
 	}
 }
-
-func PathExists(path string) (bool, error) {
-	_, err := os.Stat(path)
-	if err == nil {
-		return true, nil
-	}
-	if os.IsNotExist(err) {
-		return false, nil
-	}
-	return false, err
-}
-
-//创建文件夹
-func Mkdir(dir string) {
-	// 创建文件夹
-	exist, err := PathExists(dir)
-	if err != nil {
-		fmt.Println(err.Error())
-	} else {
-		if exist {
-			fmt.Println(dir + "文件夹已存在！")
-		} else {
-			// 文件夹名称，权限
-			err := os.Mkdir(dir, os.ModePerm)
-			if err != nil {
-				fmt.Println(dir+"文件夹创建失败：", err.Error())
-			} else {
-				fmt.Println(dir + "文件夹创建成功！")
-			}
-		}
-	}
-}
-
-//压缩文件
-func Zip(srcFile string, destZip string) error {
-	zipfile, err := os.Create(destZip)
-	if err != nil {
-		return err
-	}
-	defer zipfile.Close()
-
-	archive := zip.NewWriter(zipfile)
-	defer archive.Close()
-
-	filepath.Walk(srcFile, func(path string, info os.FileInfo, err error) error {
-		if err != nil {
-			return err
-		}
-
-		header, err := zip.FileInfoHeader(info)
-		if err != nil {
-			return err
-		}
-
-		header.Name = strings.TrimPrefix(path, filepath.Dir(srcFile)+"/")
-		// header.Name = path
-		if info.IsDir() {
-			header.Name += "/"
-		} else {
-			header.Method = zip.Deflate
-		}
-
-		writer, err := archive.CreateHeader(header)
-		if err != nil {
-			return err
-		}
-
-		if !info.IsDir() {
-			file, err := os.Open(path)
-			if err != nil {
-				return err
-			}
-			defer file.Close()
-			_, err = io.Copy(writer, file)
-		}
-		return err
-	})
-
-	return err
-}
-
-func ReadFile(filePath string) []byte {
-	f, err := os.Open(filePath)
-	if err != nil {
-		fmt.Println("read file fail", err)
-		return nil
-	}
-	defer f.Close()
-
-	fd, err := ioutil.ReadAll(f)
-	if err != nil {
-		fmt.Println("read to fd fail", err)
-		return nil
-	}
-
-	return fd
-}

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -13,7 +13,7 @@ import (
 	"net/http"
 	"net/url"
 	"strconv"
-	_"strings"
+	_ "strings"
 
 	// "fmt"
 	_ "reflect"
@@ -619,20 +619,26 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 			}
 
 			if lastPredialysisEvaluation != nil {
-				evaluation.BloodAccessPartId = lastPredialysisEvaluation.BloodAccessPartId
-				evaluation.BloodAccessPartOperaId = lastPredialysisEvaluation.BloodAccessPartOperaId
-				evaluation.AdditionalWeight = lastPredialysisEvaluation.AdditionalWeight
-				evaluation.Temperature = lastPredialysisEvaluation.Temperature
-				evaluation.BreathingRate = lastPredialysisEvaluation.BreathingRate
-				evaluation.Catheter = lastPredialysisEvaluation.Catheter
-				evaluation.InternalFistula = lastPredialysisEvaluation.InternalFistula
-				evaluation.PulseFrequency = lastPredialysisEvaluation.PulseFrequency
-				evaluation.Complication = lastPredialysisEvaluation.Complication
-				evaluation.LastPostDialysis = lastPredialysisEvaluation.LastPostDialysis
-				evaluation.DialysisInterphase = lastPredialysisEvaluation.DialysisInterphase
-				evaluation.SymptomBeforeDialysis = lastPredialysisEvaluation.SymptomBeforeDialysis
-				evaluation.PunctureNeedle = lastPredialysisEvaluation.PunctureNeedle
-				evaluation.PunctureWay = lastPredialysisEvaluation.PunctureWay
+				evaluation.BloodAccessPartId = lastPredialysisEvaluation.BloodAccessPartId           //血管通路部位
+				evaluation.BloodAccessPartOperaId = lastPredialysisEvaluation.BloodAccessPartOperaId //血管通路
+				evaluation.AdditionalWeight = lastPredialysisEvaluation.AdditionalWeight             //衣物重
+				evaluation.Temperature = lastPredialysisEvaluation.Temperature                       //温度
+				evaluation.BreathingRate = lastPredialysisEvaluation.BreathingRate                   //呼吸
+				evaluation.Catheter = lastPredialysisEvaluation.Catheter                             //导管
+				evaluation.InternalFistula = lastPredialysisEvaluation.InternalFistula               //内瘘
+				evaluation.PulseFrequency = lastPredialysisEvaluation.PulseFrequency                 //脉搏
+				evaluation.Complication = lastPredialysisEvaluation.Complication                     //并发症
+				evaluation.LastPostDialysis = lastPredialysisEvaluation.LastPostDialysis             //前次透析后症状
+				evaluation.DialysisInterphase = lastPredialysisEvaluation.DialysisInterphase         //透析期间
+				evaluation.SymptomBeforeDialysis = lastPredialysisEvaluation.SymptomBeforeDialysis   //透析前症状
+				evaluation.PunctureNeedle = lastPredialysisEvaluation.PunctureNeedle                 //穿刺针
+				evaluation.PunctureWay = lastPredialysisEvaluation.PunctureWay                       //穿刺方法
+
+				evaluation.InternalFistulaSkin = lastPredialysisEvaluation.InternalFistulaSkin //血透通路皮肤情况
+				evaluation.CatheterBend = lastPredialysisEvaluation.CatheterBend               //导管打折
+				evaluation.IsHemorrhage = lastPredialysisEvaluation.IsHemorrhage               //出血
+				evaluation.IsInfect = lastPredialysisEvaluation.IsInfect                       //感染
+				evaluation.Exposed = lastPredialysisEvaluation.Exposed                         // 外漏
 
 			}
 		} else {
@@ -696,40 +702,41 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 	}
 }
 
-func (c *CheckWeightApiController) SetSyncTime(){
+func (c *CheckWeightApiController) SetSyncTime() {
 	sn := c.GetString("sn")
-	if len(sn)  > 0 {
+	if len(sn) > 0 {
 		redis := service.RedisClient()
 		defer redis.Close()
-		redis.Set(sn, 0,0)
+		redis.Set(sn, 0, 0)
 	}
 	serviceTime := time.Now().Unix()
 	c.ServeSuccessJSON(map[string]interface{}{
-		"status": 	1,
+		"status":      1,
 		"servicetime": serviceTime,
 	})
 }
 
 func (c *CheckWeightApiController) GetPatientList() {
-	ftype,_ := c.GetInt64("type",0)
+	ftype, _ := c.GetInt64("type", 0)
 	sn := c.GetString("sn")
 	syncTime := int64(0)
 
 	redis := service.RedisClient()
 	defer redis.Close()
-	if len(sn)  > 0 {
+	if len(sn) > 0 {
 		syncTimeStr, _ := redis.Get(sn).Result()
-		syncTime,_ = strconv.ParseInt(syncTimeStr, 10, 64)
+		syncTime, _ = strconv.ParseInt(syncTimeStr, 10, 64)
 	}
 
 	if ftype == 1 {
 		timeNow := time.Now().Unix()
-		redis.Set(sn, timeNow,0)
+		redis.Set(sn, timeNow, 0)
 	}
 
 	adminUserInfo := c.GetMobileAdminUserInfo()
 
 	patientList, total, error := service.GetPatientListByUpdateTime(adminUserInfo.Org.Id, int64(syncTime))
+	if len(patientList) > 0 {
 	need_update := 0
 	if syncTime ==  0 {
 		need_update = 1
@@ -741,7 +748,7 @@ func (c *CheckWeightApiController) GetPatientList() {
 	}
 	serviceTime := time.Now().Unix()
 	c.ServeSuccessJSON(map[string]interface{}{
-		"need_update" : need_update,
+		"need_update": need_update,
 		"patientlist": patientList,
 		"total":       total,
 		"servicetime": serviceTime,
@@ -780,7 +787,7 @@ func (c *CheckWeightApiController) GetPatientListForSchedules() {
 }
 
 func (c *CheckWeightApiController) GetPatientListForSchedulesFind() {
-	patient_name := c.GetString("patient_name")                   //脉率
+	patient_name := c.GetString("patient_name") //脉率
 	thisTime := time.Now()
 	scheduleDateStart := thisTime.Format("2006-01-02") + " 00:00:00"
 	timeLayout := "2006-01-02 15:04:05"
@@ -811,8 +818,8 @@ func (c *CheckWeightApiController) GetPatientListForSchedulesFind() {
 			"servicetime": serviceTime,
 		})
 	} else {
-		patientList, total, error := service.GetPatientListBySchedulesFind(adminUserInfo.Org.Id, syncTime,patient_name)
-		patientSchedule := make([]map[string]interface{},0)
+		patientList, total, error := service.GetPatientListBySchedulesFind(adminUserInfo.Org.Id, syncTime, patient_name)
+		patientSchedule := make([]map[string]interface{}, 0)
 		for _, item := range patientList {
 			if item.Patient.ID > 0 {
 				patientTemp := make(map[string]interface{})
@@ -923,12 +930,12 @@ func (c *CheckWeightApiController) GetPatientInfoDialysis() {
 		}
 
 		// 排队叫号的签到
-		go func (){
+		go func() {
 			ssoDomain := beego.AppConfig.String("call_domain")
 			api := ssoDomain + "/index/patientsign/" + strconv.FormatInt(adminUserInfo.Org.Id, 10) + "/" + strconv.FormatInt(id, 10)
 			values := make(url.Values)
 			http.PostForm(api, values)
-		} ()
+		}()
 	} else {
 		nextSchedule, _ := service.GetNextSchedule(adminUserInfo.Org.Id, endTime, id)
 		if len(nextSchedule) <= 0 {

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -251,7 +251,7 @@ func (this *DialysisAPIController) DialysisRecord() {
 	}
 
 	schedual, getSchedualErr := service.MobileGetSchedualDetail(adminInfo.Org.Id, patientID, date.Unix())
-	// this.TraceLog("==================================%+v", schedual)
+
 	if getSchedualErr != nil {
 		this.ErrorLog("获取患者排班信息失败:%v", getSchedualErr)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -372,6 +372,9 @@ func (this *DialysisAPIController) DialysisRecord() {
 
 	_, is_open_config := service.FindXTHisRecordByOrgId(adminInfo.Org.Id)
 
+	stockType, _ := service.GetStockType(adminInfo.Org.Id)
+
+	prepare, _ := service.GetDialyStockOut(adminInfo.Org.Id, date.Unix(), patientID)
 	var his_advices []*models.HisDoctorAdviceInfo
 	if is_open_config.IsOpen == 1 {
 		his_advices, _ = service.GetAllHisDoctorAdvice(adminInfo.Org.Id, patientID, date.Unix())
@@ -424,6 +427,8 @@ func (this *DialysisAPIController) DialysisRecord() {
 		"system_prescription":            systemDialysisPrescribe,
 		"his_advices":                    his_advices,
 		"is_open_config":                 is_open_config,
+		"stockType":                      stockType,
+		"prepare":                        prepare,
 	}
 	this.ServeSuccessJSON(returnData)
 }
@@ -1057,6 +1062,8 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 	anticoagulant_stop_time_hour, _ := c.GetInt64("anticoagulant_stop_time_hour", 0)
 	anticoagulant_stop_time_min, _ := c.GetInt64("anticoagulant_stop_time_min", 0)
 	blood := c.GetString("blood")
+	dialysis_dialyszers := c.GetString("dialysis_dialyszers")
+	dialysis_irrigation := c.GetString("dialysis_irrigation")
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
 	//
@@ -1140,6 +1147,8 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 		AnticoagulantStopTimeHour:  anticoagulant_stop_time_hour,
 		AnticoagulantStopTimeMin:   anticoagulant_stop_time_min,
 		Blood:                      blood,
+		DialysisDialyszers:         dialysis_dialyszers,
+		DialysisIrrigation:         dialysis_irrigation,
 	}
 
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
@@ -1853,6 +1862,8 @@ func (c *DialysisAPIController) PostSolution() {
 	anticoagulant_stop_time_hour, _ := c.GetInt64("anticoagulant_stop_time_hour", 0)
 	anticoagulant_stop_time_min, _ := c.GetInt64("anticoagulant_stop_time_min", 0)
 	blood := c.GetString("blood")
+	dialysis_dialyszers := c.GetString("dialysis_dialyszers")
+	dialysis_irrigation := c.GetString("dialysis_irrigation")
 	if mode_id > 0 {
 		service.ModifyScheduleMode(mode_id, patient.ID, recordDate.Unix(), adminUserInfo.Org.Id)
 	}
@@ -1937,6 +1948,8 @@ func (c *DialysisAPIController) PostSolution() {
 		AnticoagulantStopTimeMin:  anticoagulant_stop_time_min,
 		AnticoagulantStopTimeHour: anticoagulant_stop_time_hour,
 		Blood:                     blood,
+		DialysisDialyszers:        dialysis_dialyszers,
+		DialysisIrrigation:        dialysis_irrigation,
 	}
 
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
@@ -3005,7 +3018,8 @@ func (c *DialysisAPIController) CreateConsumables() {
 				}
 
 				count, _ := strconv.ParseInt(items["count"].(string), 10, 64)
-
+				//commdity_code := items["commdity_code"].(string)
+				//fmt.Println("新建22222222222222",commdity_code)
 				adminUser := c.GetMobileAdminUserInfo()
 				prepare := &models.DialysisBeforePrepare{
 					UserOrgId:  adminUser.Org.Id,
@@ -3018,6 +3032,7 @@ func (c *DialysisAPIController) CreateConsumables() {
 					Mtime:      time.Now().Unix(),
 					Creater:    adminUser.AdminUser.Id,
 					Modifier:   0,
+					//CommdityCode:commdity_code,
 				}
 				record_count := service.FindDialysisBeforePrepare(prepare.PatientId, prepare.GoodId, prepare.GoodTypeId, adminUser.Org.Id, record_time)
 				if record_count == 0 {
@@ -3096,6 +3111,8 @@ func (c *DialysisAPIController) CreateConsumables() {
 				}
 				ctime := int64(items["ctime"].(float64))
 
+				//commdity_code := items["commdity_code"].(string)
+				//fmt.Println("commdityecode22222222222222222222",commdity_code)
 				prepare := &models.DialysisBeforePrepare{
 					ID:         id,
 					UserOrgId:  adminUser.Org.Id,
@@ -3109,6 +3126,7 @@ func (c *DialysisAPIController) CreateConsumables() {
 					Creater:    creater,
 					Modifier:   adminUser.AdminUser.Id,
 					Status:     1,
+					//CommdityCode: commdity_code,
 				}
 				updateBeforePrepares = append(updateBeforePrepares, prepare)
 
@@ -3405,7 +3423,8 @@ func (c *DialysisAPIController) EditConsumables() {
 						return
 					}
 					ctime := int64(items["ctime"].(float64))
-
+					//commdity_code := items["commdity_code"].(string)
+					//fmt.Println("commdityecode22222222222222222222",commdity_code)
 					adminUser := c.GetMobileAdminUserInfo()
 					prepare := &models.DialysisBeforePrepare{
 						ID:         id,
@@ -3420,6 +3439,7 @@ func (c *DialysisAPIController) EditConsumables() {
 						Creater:    creater,
 						Modifier:   adminUser.AdminUser.Id,
 						Status:     1,
+						//CommdityCode: commdity_code,
 					}
 					beforePrepares = append(beforePrepares, prepare)
 
@@ -3456,7 +3476,8 @@ func (c *DialysisAPIController) EditConsumables() {
 					}
 
 					count, _ := strconv.ParseInt(items["count"].(string), 10, 64)
-
+					//commdity_code := items["commdity_code"].(string)
+					//fmt.Println("commdityecode22222222222222222222",commdity_code)
 					adminUser := c.GetMobileAdminUserInfo()
 					prepare := &models.DialysisBeforePrepare{
 						UserOrgId:  adminUser.Org.Id,
@@ -3469,6 +3490,7 @@ func (c *DialysisAPIController) EditConsumables() {
 						Mtime:      time.Now().Unix(),
 						Creater:    adminUser.AdminUser.Id,
 						Modifier:   0,
+						//CommdityCode:commdity_code,
 					}
 					newBeforePrepares = append(newBeforePrepares, prepare)
 
@@ -4282,6 +4304,7 @@ func (c *DialysisAPIController) CreateOtherStockOutInfo() {
 						GoodTypeId:              item.GoodTypeId,
 						Count:                   item.Count,
 					}
+
 					service.AddSigleAutoReduceRecordInfo(details)
 				}
 			}

controllers/mobile_api_controllers/patient_api_controller.go

@@ -2363,6 +2363,27 @@ func predialysisEvaluationFormData(evaluation *models.PredialysisEvaluation, dat
 		evaluation.CatheterMaintenance = catheter_maintenance
 	}
 
+	if dataBody["thromubus_type"] != nil && reflect.TypeOf(dataBody["thromubus_type"]).String() == "float64" {
+
+		thromubusType := int64(dataBody["thromubus_type"].(float64))
+
+		evaluation.ThromubusType = thromubusType
+	}
+
+	if dataBody["thrombus_av"] != nil && reflect.TypeOf(dataBody["thrombus_av"]).String() == "string" {
+		thrombus_av := dataBody["thrombus_av"].(string)
+		evaluation.ThrombusAv = thrombus_av
+	}
+
+	if dataBody["thromubus_a"] != nil && reflect.TypeOf(dataBody["thromubus_a"]).String() == "string" {
+		thromubus_a := dataBody["thromubus_a"].(string)
+		evaluation.ThromubusA = thromubus_a
+	}
+
+	if dataBody["thromubus_v"] != nil && reflect.TypeOf(dataBody["thromubus_v"]).String() == "string" {
+		thromubus_v := dataBody["thromubus_v"].(string)
+		evaluation.ThromubusV = thromubus_v
+	}
 	return
 }
 
@@ -2686,6 +2707,7 @@ func (c *PatientApiController) GetRecords() {
 func (c *PatientApiController) GetPatientMonitor() {
 	partition, _ := c.GetInt64("partition")
 	monitorDate := c.GetString("date")
+	patient_id, _ := c.GetInt64("patient_id")
 
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
@@ -2700,10 +2722,16 @@ func (c *PatientApiController) GetPatientMonitor() {
 	}
 	adminInfo := c.GetMobileAdminUserInfo()
 	orgID := adminInfo.Org.Id
-	monitor, err := service.GetMonitorRecord(orgID, theStartTime, partition)
+	monitor, err := service.GetMonitorRecord(orgID, theStartTime, partition, patient_id)
+	//获取患者的透析次数
+	count, err := service.GetDialysisCount(orgID, partition)
+
+	patients, err := service.GetAllpatient(orgID)
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
-			"monitor": monitor,
+			"monitor":      monitor,
+			"patientCount": count,
+			"patients":     patients,
 		})
 	} else {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
@@ -2904,23 +2932,48 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
 	check, _ := service.FindDoubleCheckById(adminUserInfo.Org.Id, patientInfo.ID, xttime)
 
 	dialysiscount, err := service.GetDialysisCountByPatientId(firstMonthDate, xttime, patientInfo.ID, adminUserInfo.Org.Id)
-	c.ServeSuccessJSON(map[string]interface{}{
-		"users":                   adminUser,
-		"patientInfo":             patientInfo,
-		"PredialysisEvaluation":   PredialysisEvaluation,
-		"AssessmentAfterDislysis": AssessmentAfterDislysis,
-		"dialysisPrescription":    dialysisPrescription,
-		"advices":                 DoctorAdvice,
-		"monitors":                Record,
-		"summary":                 TreatmentSummary,
-		"receiverTreatmentAccess": receiverTreatmentAccess,
-		"dialysisOrder":           dialysisOrder,
-		"operators":               operators,
-		"org_template_info":       templateInfo,
-		"check":                   check,
-		"dialysiscount":           dialysiscount,
-		"last_order":              last_order,
-	})
+
+	config, err := service.GetHisDoctorConfig(adminUserInfo.Org.Id)
+	hisAdvice, err := service.GetHisDoctorPatientById(adminUserInfo.Org.Id, patientInfo.ID, xttime)
+	if config.IsOpen == 1 {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"users":                   adminUser,
+			"patientInfo":             patientInfo,
+			"PredialysisEvaluation":   PredialysisEvaluation,
+			"AssessmentAfterDislysis": AssessmentAfterDislysis,
+			"dialysisPrescription":    dialysisPrescription,
+			"advices":                 hisAdvice,
+			"monitors":                Record,
+			"summary":                 TreatmentSummary,
+			"receiverTreatmentAccess": receiverTreatmentAccess,
+			"dialysisOrder":           dialysisOrder,
+			"operators":               operators,
+			"org_template_info":       templateInfo,
+			"check":                   check,
+			"dialysiscount":           dialysiscount,
+			"last_order":              last_order,
+		})
+	}
+
+	if config.IsOpen == 0 || config.IsOpen == 2 {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"users":                   adminUser,
+			"patientInfo":             patientInfo,
+			"PredialysisEvaluation":   PredialysisEvaluation,
+			"AssessmentAfterDislysis": AssessmentAfterDislysis,
+			"dialysisPrescription":    dialysisPrescription,
+			"advices":                 DoctorAdvice,
+			"monitors":                Record,
+			"summary":                 TreatmentSummary,
+			"receiverTreatmentAccess": receiverTreatmentAccess,
+			"dialysisOrder":           dialysisOrder,
+			"operators":               operators,
+			"org_template_info":       templateInfo,
+			"check":                   check,
+			"dialysiscount":           dialysiscount,
+			"last_order":              last_order,
+		})
+	}
 
 }
 

controllers/stock_in_api_controller.go

@@ -65,6 +65,8 @@ func StockManagerApiRegistRouters() {
 	beego.Router("/api/warehouseout/user", &StockManagerApiController{}, "get:GetUserDetailInfo")
 
 	beego.Router("/api/warehouseout/postsearchstock", &StockManagerApiController{}, "Get:PostSearchStock")
+
+	beego.Router("/api/warehouseout/getoutstocktotalcount", &StockManagerApiController{}, "Get:GetOutStockTotalCount")
 }
 
 func (c *StockManagerApiController) CreateWarehouse() {
@@ -1965,7 +1967,6 @@ func (this *StockManagerApiController) GetUserDetailInfo() {
 func (this *StockManagerApiController) PostSearchStock() {
 
 	keyword := this.GetString("keyword")
-	fmt.Println("keyword2222222222222", keyword)
 	adminUserInfo := this.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
 	stock, err := service.PostSearchStock(keyword, orgId)
@@ -1976,3 +1977,16 @@ func (this *StockManagerApiController) PostSearchStock() {
 		"stock": stock,
 	})
 }
+
+func (this *StockManagerApiController) GetOutStockTotalCount() {
+
+	warehouseOutTime, _ := this.GetInt64("warehouse_out_time")
+	adminUserInfo := this.GetAdminUserInfo()
+	stockCount, err := service.GetOutStockTotalCount(warehouseOutTime, adminUserInfo.CurrentOrgId)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDeleteFail)
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"stockCount": stockCount,
+	})
+}

models/dialysis.go

@@ -276,6 +276,10 @@ type PredialysisEvaluation struct {
 	Edema                          string  `gorm:"column:edema" json:"edema" form:"edema"`
 	SpecialTreatment               string  `gorm:"column:special_treatment" json:"special_treatment" form:"special_treatment"`
 	CatheterMaintenance            string  `gorm:"column:catheter_maintenance" json:"catheter_maintenance" form:"catheter_maintenance"`
+	ThromubusType                  int64   `gorm:"column:thromubus_type" json:"thromubus_type" form:"thromubus_type"`
+	ThrombusAv                     string  `gorm:"column:thrombus_av" json:"thrombus_av" form:"thrombus_av"`
+	ThromubusA                     string  `gorm:"column:thromubus_a" json:"thromubus_a" form:"thromubus_a"`
+	ThromubusV                     string  `gorm:"column:thromubus_v" json:"thromubus_v" form:"thromubus_v"`
 }
 
 func (PredialysisEvaluation) TableName() string {
@@ -940,18 +944,19 @@ type UserAdminRoles struct {
 }
 
 type DialysisBeforePrepare 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"`
-	PatientId  int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	RecordDate int64 `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	GoodId     int64 `gorm:"column:good_id" json:"good_id" form:"good_id"`
-	GoodTypeId int64 `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
-	Count      int64 `gorm:"column:count" json:"count" form:"count"`
-	Ctime      int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime      int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Creater    int64 `gorm:"column:creater" json:"creater" form:"creater"`
-	Modifier   int64 `gorm:"column:modifier" json:"modifier" form:"modifier"`
-	Status     int64 `gorm:"column:status" json:"status" form:"status"`
+	ID           int64  `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId    int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId    int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	RecordDate   int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	GoodId       int64  `gorm:"column:good_id" json:"good_id" form:"good_id"`
+	GoodTypeId   int64  `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
+	Count        int64  `gorm:"column:count" json:"count" form:"count"`
+	Ctime        int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime        int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Creater      int64  `gorm:"column:creater" json:"creater" form:"creater"`
+	Modifier     int64  `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	Status       int64  `gorm:"column:status" json:"status" form:"status"`
+	CommdityCode string `gorm:"column:commdity_code" json:"commdity_code" form:"commdity_code"`
 }
 
 func (DialysisBeforePrepare) TableName() string {
@@ -977,3 +982,20 @@ type QueueCallConfig struct {
 func (QueueCallConfig) TableName() string {
 	return "xt_queue_call_config"
 }
+
+type XtDialysisBeforePrepare 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"`
+	PatientId         int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	RecordDate        int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	GoodId            int64  `gorm:"column:good_id" json:"good_id" form:"good_id"`
+	GoodTypeId        int64  `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
+	Count             int64  `gorm:"column:count" json:"count" form:"count"`
+	Ctime             int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime             int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Creater           int64  `gorm:"column:creater" json:"creater" form:"creater"`
+	Modifier          int64  `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	Status            int64  `gorm:"column:status" json:"status" form:"status"`
+	CommdityCode      string `gorm:"column:commdity_code" json:"commdity_code" form:"commdity_code"`
+	SpecificationName string `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+}

models/dialysis_parameter_models.go

@@ -148,3 +148,8 @@ type PredialysisEvaluationParameter struct {
 func (PredialysisEvaluationParameter) TableName() string {
 	return "xt_assessment_before_dislysis"
 }
+
+type NewXtAutomaticReduceDetail struct {
+	GoodId int64 `gorm:"column:good_id" json:"good_id" form:"good_id"`
+	Count  int64 `gorm:"column:count" json:"count" form:"count"`
+}

models/good_models.go

@@ -66,6 +66,7 @@ type GoodInfo struct {
 	Agent                  string    `gorm:"column:agent" json:"agent" form:"agent"`
 	GoodNumber             string    `gorm:"column:good_number" json:"good_number" form:"good_number"`
 	GoodsType              GoodsType `gorm:"ForeignKey:ID;AssociationForeignKey:GoodTypeId" json:"type"`
+	CommdityCode           string    `gorm:"column:commdity_code" json:"commdity_code" form:"commdity_code"`
 }
 
 func (GoodInfo) TableName() string {

models/his_models.go

@@ -167,56 +167,57 @@ func (HisCaseHistoryTemplate) TableName() string {
 }
 
 type HisDoctorAdviceInfo 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"`
-	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"`
-	AdviceType            int64   `gorm:"column:advice_type" json:"advice_type" form:"advice_type"`
-	AdviceDate            int64   `gorm:"column:advice_date" json:"advice_date" form:"advice_date"`
-	StartTime             int64   `gorm:"column:start_time" json:"start_time" form:"start_time"`
-	AdviceName            string  `gorm:"column:advice_name" json:"advice_name" form:"advice_name"`
-	AdviceDesc            string  `gorm:"column:advice_desc" json:"advice_desc" form:"advice_desc"`
-	ReminderDate          int64   `gorm:"column:reminder_date" json:"reminder_date" form:"reminder_date"`
-	SingleDose            float64 `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
-	SingleDoseUnit        string  `gorm:"column:single_dose_unit" json:"single_dose_unit" form:"single_dose_unit"`
-	PrescribingNumber     float64 `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
-	PrescribingNumberUnit string  `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
-	DeliveryWay           string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
-	ExecutionFrequency    string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
-	AdviceDoctor          int64   `gorm:"column:advice_doctor" json:"advice_doctor" form:"advice_doctor"`
-	Status                int64   `gorm:"column:status" json:"status" form:"status"`
-	CreatedTime           int64   `gorm:"column:created_time" json:"created_time" form:"created_time"`
-	UpdatedTime           int64   `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
-	AdviceAffirm          string  `gorm:"column:advice_affirm" json:"advice_affirm" form:"advice_affirm"`
-	Remark                string  `gorm:"column:remark" json:"remark" form:"remark"`
-	StopTime              int64   `gorm:"column:stop_time" json:"stop_time" form:"stop_time"`
-	StopReason            string  `gorm:"column:stop_reason" json:"stop_reason" form:"stop_reason"`
-	StopDoctor            int64   `gorm:"column:stop_doctor" json:"stop_doctor" form:"stop_doctor"`
-	StopState             int64   `gorm:"column:stop_state" json:"stop_state" form:"stop_state"`
-	ParentId              int64   `gorm:"column:parent_id" json:"parent_id" form:"parent_id"`
-	ExecutionTime         int64   `gorm:"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"`
-	Checker               int64   `gorm:"column:checker" json:"checker" form:"checker"`
-	RecordDate            int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	DialysisOrderId       int64   `gorm:"column:dialysis_order_id" json:"dialysis_order_id" form:"dialysis_order_id"`
-	CheckTime             int64   `gorm:"column:check_time" json:"check_time" form:"check_time"`
-	CheckState            int64   `gorm:"column:check_state" json:"check_state" form:"check_state"`
-	DrugSpec              float64 `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"`
-	Groupno               int64   `gorm:"column:groupno" json:"groupno" form:"groupno"`
-	RemindType            int64   `gorm:"column:remind_type" json:"remind_type" form:"remind_type"`
-	FrequencyType         int64   `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
-	DayCount              int64   `gorm:"column:day_count" json:"day_count" form:"day_count"`
-	WeekDay               string  `gorm:"column:week_day" json:"week_day" form:"week_day"`
-	TemplateId            string  `gorm:"column:template_id" json:"template_id" form:"template_id"`
-	Modifier              int64   `gorm:"column:modifier" json:"modifier" form:"modifier"`
-	DrugId                int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
-	Price                 float64 `gorm:"column:price" json:"price" form:"price"`
-	PrescriptionId        int64   `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
-	MedListCodg           string  `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
-	FeedetlSn             string  `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
-	Day                   int64   `gorm:"column:day" json:"day" form:"day"`
+	ID                    int64                  `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId             int64                  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	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"`
+	AdviceType            int64                  `gorm:"column:advice_type" json:"advice_type" form:"advice_type"`
+	AdviceDate            int64                  `gorm:"column:advice_date" json:"advice_date" form:"advice_date"`
+	StartTime             int64                  `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	AdviceName            string                 `gorm:"column:advice_name" json:"advice_name" form:"advice_name"`
+	AdviceDesc            string                 `gorm:"column:advice_desc" json:"advice_desc" form:"advice_desc"`
+	ReminderDate          int64                  `gorm:"column:reminder_date" json:"reminder_date" form:"reminder_date"`
+	SingleDose            float64                `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	SingleDoseUnit        string                 `gorm:"column:single_dose_unit" json:"single_dose_unit" form:"single_dose_unit"`
+	PrescribingNumber     float64                `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
+	PrescribingNumberUnit string                 `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
+	DeliveryWay           string                 `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency    string                 `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	AdviceDoctor          int64                  `gorm:"column:advice_doctor" json:"advice_doctor" form:"advice_doctor"`
+	Status                int64                  `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime           int64                  `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime           int64                  `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	AdviceAffirm          string                 `gorm:"column:advice_affirm" json:"advice_affirm" form:"advice_affirm"`
+	Remark                string                 `gorm:"column:remark" json:"remark" form:"remark"`
+	StopTime              int64                  `gorm:"column:stop_time" json:"stop_time" form:"stop_time"`
+	StopReason            string                 `gorm:"column:stop_reason" json:"stop_reason" form:"stop_reason"`
+	StopDoctor            int64                  `gorm:"column:stop_doctor" json:"stop_doctor" form:"stop_doctor"`
+	StopState             int64                  `gorm:"column:stop_state" json:"stop_state" form:"stop_state"`
+	ParentId              int64                  `gorm:"column:parent_id" json:"parent_id" form:"parent_id"`
+	ExecutionTime         int64                  `gorm:"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"`
+	Checker               int64                  `gorm:"column:checker" json:"checker" form:"checker"`
+	RecordDate            int64                  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	DialysisOrderId       int64                  `gorm:"column:dialysis_order_id" json:"dialysis_order_id" form:"dialysis_order_id"`
+	CheckTime             int64                  `gorm:"column:check_time" json:"check_time" form:"check_time"`
+	CheckState            int64                  `gorm:"column:check_state" json:"check_state" form:"check_state"`
+	DrugSpec              float64                `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"`
+	Groupno               int64                  `gorm:"column:groupno" json:"groupno" form:"groupno"`
+	RemindType            int64                  `gorm:"column:remind_type" json:"remind_type" form:"remind_type"`
+	FrequencyType         int64                  `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
+	DayCount              int64                  `gorm:"column:day_count" json:"day_count" form:"day_count"`
+	WeekDay               string                 `gorm:"column:week_day" json:"week_day" form:"week_day"`
+	TemplateId            string                 `gorm:"column:template_id" json:"template_id" form:"template_id"`
+	Modifier              int64                  `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	DrugId                int64                  `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Price                 float64                `gorm:"column:price" json:"price" form:"price"`
+	PrescriptionId        int64                  `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
+	MedListCodg           string                 `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
+	FeedetlSn             string                 `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	Day                   int64                  `gorm:"column:day" json:"day" form:"day"`
+	ChildDoctorAdvice     []*HisDoctorAdviceInfo `gorm:"ForeignKey:ParentId;AssociationForeignKey:ID" json:"child"`
 }
 
 func (HisDoctorAdviceInfo) TableName() string {

models/new_monitor.go

@@ -20,7 +20,7 @@ type NewVMMonitorDialysisSchedule struct {
 	Prescription             VMDialysisPrescription    `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"prescription"`
 	AssessmentBeforeDislysis VMPredialysisEvaluation   `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"assessment_before_dislysis"`
 	AssessmentAfterDislysis  VMAssessmentAfterDislysis `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"assessment_after_dislysis"`
-	MonitoringRecord         []VMMonitoringRecord      `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"monitoring_record"`
+	MonitoringRecord         []VMMonitoringRecord      `gorm:"ForeignKey:PatientId,MonitoringDate;AssociationForeignKey:PatientId,ScheduleDate" json:"monitoring_record"`
 }
 
 func (NewVMMonitorDialysisSchedule) TableName() string {
@@ -28,11 +28,12 @@ func (NewVMMonitorDialysisSchedule) TableName() string {
 }
 
 type VMMonitorPatients 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"`
-	DialysisNo string `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
+	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"`
+	DialysisNo         string `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
+	UserSysBeforeCount int64  `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
 }
 
 func (VMMonitorPatients) TableName() string {

models/patient_models.go

@@ -225,6 +225,8 @@ type DialysisPrescription struct {
 	AnticoagulantStopTimeMin   int64         `gorm:"column:anticoagulant_stop_time_min" json:"anticoagulant_stop_time_min" form:"anticoagulant_stop_time_min"`
 	AnticoagulantStopTimeHour  int64         `gorm:"column:anticoagulant_stop_time_hour" json:"anticoagulant_stop_time_hour" form:"anticoagulant_stop_time_hour"`
 	Blood                      string        `gorm:"column:blood" json:"blood"`
+	DialysisDialyszers         string        `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
+	DialysisIrrigation         string        `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
 }
 
 func (DialysisPrescription) TableName() string {

service/dialysis_service.go

@@ -1055,11 +1055,11 @@ func CreateDialysisBeforePrepare(beforePrepares []*models.DialysisBeforePrepare)
 	if len(beforePrepares) > 0 {
 		utx := writeDb.Begin()
 		if len(beforePrepares) > 0 {
-			thisSQL := "INSERT INTO dialysis_before_prepare (user_org_id, patient_id, record_date, good_id, good_type_id,count,ctime,mtime,creater,modifier,status) VALUES "
+			thisSQL := "INSERT INTO dialysis_before_prepare (user_org_id, patient_id, record_date, good_id, good_type_id,count,ctime,mtime,creater,modifier,status,commdity_code) VALUES "
 			insertParams := make([]string, 0)
 			insertData := make([]interface{}, 0)
 			for _, prepare := range beforePrepares {
-				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?)")
+				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?)")
 				insertData = append(insertData, prepare.UserOrgId)
 				insertData = append(insertData, prepare.PatientId)
 				insertData = append(insertData, prepare.RecordDate)
@@ -1071,7 +1071,7 @@ func CreateDialysisBeforePrepare(beforePrepares []*models.DialysisBeforePrepare)
 				insertData = append(insertData, prepare.Creater)
 				insertData = append(insertData, prepare.Modifier)
 				insertData = append(insertData, 1)
-
+				insertData = append(insertData, prepare.CommdityCode)
 			}
 			thisSQL += strings.Join(insertParams, ", ")
 			err = utx.Exec(thisSQL, insertData...).Error
@@ -1094,7 +1094,7 @@ func UpdateDialysisBeforePrepare(info *models.DialysisBeforePrepare) (err error)
 func UpdateDialysisBeforePrepareTwo(info *models.DialysisBeforePrepare) (err error) {
 	err = writeDb.Model(&models.DialysisBeforePrepare{}).
 		Where("status = 1 AND good_id = ? AND good_type_id = ? AND patient_id = ? AND user_org_id = ? AND record_date = ?", info.GoodId, info.GoodTypeId, info.PatientId, info.UserOrgId, info.RecordDate).
-		Updates(map[string]interface{}{"count": info.Count, "updated_time": time.Now().Unix(), "modifier": info.Modifier}).Error
+		Updates(map[string]interface{}{"count": info.Count, "updated_time": time.Now().Unix(), "modifier": info.Modifier, "commdity_code": info.CommdityCode}).Error
 
 	return err
 }

service/drug_stock_service.go

@@ -90,17 +90,56 @@ func (DrugStockInfo) TableName() string {
 	return "xt_base_drug"
 }
 
-func FindAllDrugStockInfo(orgId int64, page int64, limit int64, keyword string) (list []*DrugStockInfo, total int64, err error) {
+func FindAllDrugStockInfo(orgId int64, page int64, limit int64, keyword string, drugCategory int64, startTime int64, endTime int64) (list []*DrugStockInfo, total int64, err error) {
 	db := readDb.Model(&DrugStockInfo{})
-	db = db.Where("xt_base_drug.org_id = ? AND xt_base_drug.status = 1", orgId)
-	db = db.Preload("QueryWarehousingInfo", func(db *gorm.DB) *gorm.DB {
-		return db.Where("org_id = ? AND status = 1", orgId)
-	})
-	db = db.Preload("QuerySalesReturnInfo", "org_id = ? AND status = 1", orgId)
-	db = db.Preload("QueryWarehouseOutInfo", func(db *gorm.DB) *gorm.DB {
-		return db.Where("org_id = ? AND status = 1", orgId)
-	})
-	db = db.Preload("QueryCancelStockInfo", "org_id = ? AND status = 1", orgId)
+	if drugCategory > 0 {
+		db = db.Where("xt_base_drug.org_id = ? AND xt_base_drug.status = 1 AND xt_base_drug.drug_category = ?", orgId, drugCategory)
+	} else {
+		db = db.Where("xt_base_drug.org_id = ? AND xt_base_drug.status = 1", orgId)
+	}
+
+	if startTime > 0 {
+		db = db.Preload("QueryWarehousingInfo", func(db *gorm.DB) *gorm.DB {
+			return db.Where("org_id = ? AND status = 1 and ctime >=?", orgId, startTime)
+		})
+		db = db.Preload("QuerySalesReturnInfo", "org_id = ? AND status = 1 and ctime>=?", orgId, startTime)
+		db = db.Preload("QueryWarehouseOutInfo", func(db *gorm.DB) *gorm.DB {
+			return db.Where("org_id = ? AND status = 1 and sys_record_time>=?", orgId, startTime)
+		})
+		db = db.Preload("QueryCancelStockInfo", "org_id = ? AND status = 1 and ctime>=?", orgId, startTime)
+	} else {
+
+		db = db.Preload("QueryWarehousingInfo", func(db *gorm.DB) *gorm.DB {
+			return db.Where("org_id = ? AND status = 1", orgId)
+		})
+		db = db.Preload("QuerySalesReturnInfo", "org_id = ? AND status = 1", orgId)
+		db = db.Preload("QueryWarehouseOutInfo", func(db *gorm.DB) *gorm.DB {
+			return db.Where("org_id = ? AND status = 1", orgId)
+		})
+		db = db.Preload("QueryCancelStockInfo", "org_id = ? AND status = 1", orgId)
+	}
+
+	if endTime > 0 {
+		db = db.Preload("QueryWarehousingInfo", func(db *gorm.DB) *gorm.DB {
+			return db.Where("org_id = ? AND status = 1 and ctime>=? and ctime <=?", orgId, startTime, endTime)
+		})
+		db = db.Preload("QuerySalesReturnInfo", "org_id = ? AND status = 1 and ctime>=? and ctime<=?", orgId, startTime, endTime)
+		db = db.Preload("QueryWarehouseOutInfo", func(db *gorm.DB) *gorm.DB {
+			return db.Where("org_id = ? AND status = 1 and sys_record_time<=?", orgId, endTime)
+		})
+		db = db.Preload("QueryCancelStockInfo", "org_id = ? AND status = 1 and ctime >=? and ctime<=?", orgId, startTime, endTime)
+	} else {
+
+		db = db.Preload("QueryWarehousingInfo", func(db *gorm.DB) *gorm.DB {
+			return db.Where("org_id = ? AND status = 1", orgId)
+		})
+		db = db.Preload("QuerySalesReturnInfo", "org_id = ? AND status = 1", orgId)
+		db = db.Preload("QueryWarehouseOutInfo", func(db *gorm.DB) *gorm.DB {
+			return db.Where("org_id = ? AND status = 1", orgId)
+		})
+		db = db.Preload("QueryCancelStockInfo", "org_id = ? AND status = 1", orgId)
+	}
+
 	if len(keyword) > 0 {
 		likeKey := "%" + keyword + "%"
 		db = db.Where("xt_base_drug.drug_name LIKE ? OR xt_base_drug.drug_spec LIKE ?", likeKey, likeKey)

service/manage_service.go

@@ -901,7 +901,7 @@ func GetTimeLastData(equitid int64, orgId int64) (models.DeviceInformation, erro
 }
 
 func GetAllpatient(orgid int64) (patients []*models.Patients, err error) {
-	err = XTReadDB().Where("user_org_id = ?", orgid).Find(&patients).Error
+	err = XTReadDB().Where("user_org_id = ? and status = 1", orgid).Find(&patients).Error
 	return patients, err
 }
 

service/mobile_dialysis_service.go

@@ -1529,7 +1529,7 @@ func MobileGetDialysisGoods(orgID int64, scheduleDate int64, schedule_type int64
 			return db.Preload("VMGoodInfo", "status = 1 AND org_id = ?", orgID).Preload("GoodsType", "status = 1 AND (org_id = ? OR org_id = 0) ", orgID).Where("status = 1 AND user_org_id = ? AND record_date = ?  AND count > 0 ", orgID, scheduleDate)
 		}).
 		Preload("AutomaticReduceDetail", func(db *gorm.DB) *gorm.DB {
-			return db.Preload("VMGoodInfo", "status = 1 AND org_id = ? ", orgID).Preload("GoodsType", "status = 1 AND (org_id = ? OR org_id = 0)  ", orgID).Where("status = 1 AND org_id = ? AND count > 0 AND record_time >= ? AND record_time <= ?  ", orgID, scheduleDate, end_time)
+			return db.Preload("VMGoodInfo", "status = 1 AND org_id = ? ", orgID).Preload("GoodsType", "status = 1 AND (org_id = ? OR org_id = 0)  ", orgID).Where("status = 1 AND org_id = ? AND count > 0 AND record_time >= ? AND record_time <= ?  ", orgID, scheduleDate, end_time).Group("patient_id,good_id")
 		}).Where("sch.status = 1 AND sch.user_org_id = ?", orgID)
 	if scheduleDate != 0 {
 		db = db.Where("schedule_date = ?", scheduleDate)
@@ -1710,3 +1710,19 @@ func GetHisDoctorConfig(orgid int64) (models.XtHisConfig, error) {
 	err := XTReadDB().Model(&config).Where("user_org_id = ? and status =1", orgid).Find(&config).Error
 	return config, err
 }
+
+func GetHisDoctorPatientById(orgid int64, patientid int64, recordtime int64) (advice []*models.HisDoctorAdviceInfo, err error) {
+
+	db := XTReadDB().Table("his_doctor_advice_info as x").Where("x.status = 1")
+	if orgid > 0 {
+		db = db.Where("x.user_org_id = ?", orgid)
+	}
+	if patientid > 0 {
+		db = db.Where("x.patient_id =?", patientid)
+	}
+	if recordtime > 0 {
+		db = db.Where("x.advice_date = ?", recordtime)
+	}
+	err = db.Select("x.id,x.user_org_id,x.patient_id,x.his_patient_id,x.advice_type,x.advice_date,x.start_time,x.advice_name,x.advice_desc,x.reminder_date,x.single_dose,x.single_dose_unit,x.single_dose_unit,x.prescribing_number_unit,x.prescribing_number,x.delivery_way,x.execution_frequency,x.advice_doctor,x.status,x.advice_affirm,x.remark,x.stop_time,x.stop_reason,x.stop_doctor,x.stop_state,x.parent_id,x.execution_time,x.execution_staff,x.checker,x.record_date,x.dialysis_order_id,x.check_time,x.check_state,x.drug_spec,x.drug_spec_unit,x.groupno,x.remind_type,x.frequency_type,x.day_count,x.week_day,x.template_id,x.modifier,x.drug_id,x.price,x.prescription_id,x.med_list_codg,x.feedetl_sn,x.day").Find(&advice).Error
+	return advice, err
+}

service/patient_service.go

@@ -82,9 +82,9 @@ func GetAllPatientList(orgID int64) (patients []*models.Patients, total int64, e
 
 func GetPatientListByUpdateTime(orgID int64, syncTime int64) (patients []*models.PatientListForFaceList, total int64, err error) {
 	db := readDb.Model(&models.PatientListForFaceList{}).Where("user_org_id=?  AND  status=1  AND  avatar <> 'https://images.shengws.com/201809182128222.png' AND avatar <> 'https://images.shengws.com/201809182128111.png' AND avatar <> ''", orgID)
-	
-		db = db.Where("updated_time >= ?", syncTime)
-	
+
+	db = db.Where("updated_time >= ?", syncTime)
+
 	err = db.Count(&total).Find(&patients).Error
 	return
 }
@@ -1013,28 +1013,58 @@ func GetPatientScheduleList(orgID int64, patientID int64, page int64, limit int6
 	return
 }
 
-func GetMonitorRecord(orgID int64, date int64, partition int64) ([]*models.NewVMMonitorDialysisSchedule, error) {
+func GetMonitorRecord(orgID int64, date int64, partition int64, patientId int64) ([]*models.NewVMMonitorDialysisSchedule, error) {
 	var mds []*models.NewVMMonitorDialysisSchedule
-	db := readDb.
-		Model(&models.NewVMMonitorDialysisSchedule{}).
-		Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
-		Preload("DeviceZone", "status = 1 AND org_id = ?", orgID).
-		Preload("TreatmentMode", "status = 1").
-		Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, date).
-		Preload("AssessmentBeforeDislysis", "status = 1 AND  user_org_id = ? AND assessment_date = ?", orgID, date).
-		Preload("AssessmentAfterDislysis", "status = 1 AND  user_org_id = ? AND assessment_date = ? ", orgID, date).
-		Preload("MonitoringRecord", "status = 1 AND  user_org_id = ? AND monitoring_date = ?", orgID, date).
-		Preload("DialysisOrder", "status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, date).
-		Preload("DialysisOrder.DeviceNumber", "status = 1 AND  org_id = ?", orgID).
-		Preload("MonitorPatients", "status = 1 AND user_org_id = ?", orgID).
-		Where("status = 1 AND user_org_id = ?", orgID)
-	if date != 0 {
-		db = db.Where("schedule_date = ? ", date)
-	}
-	if partition != 0 {
-		db = db.Where("partition_id = ? ", partition)
+
+	if patientId == 0 {
+		db := readDb.
+			Model(&models.NewVMMonitorDialysisSchedule{}).
+			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+			Preload("DeviceZone", "status = 1 AND org_id = ?", orgID).
+			Preload("TreatmentMode", "status = 1").
+			Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, date).
+			Preload("AssessmentBeforeDislysis", "status = 1 AND  user_org_id = ? AND assessment_date = ?", orgID, date).
+			Preload("AssessmentAfterDislysis", "status = 1 AND  user_org_id = ? AND assessment_date = ? ", orgID, date).
+			Preload("MonitoringRecord", "status = 1 AND  user_org_id = ? AND monitoring_date = ?", orgID, date).
+			Preload("DialysisOrder", "status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, date).
+			Preload("DialysisOrder.DeviceNumber", "status = 1 AND  org_id = ?", orgID).
+			Preload("MonitorPatients", "status = 1 AND user_org_id = ?", orgID).
+			Where("status = 1 AND user_org_id = ?", orgID)
+		if date != 0 {
+			db = db.Where("schedule_date = ? ", date)
+		}
+		if partition != 0 {
+			db = db.Where("partition_id = ? ", partition)
+		}
+		err := db.Find(&mds).Error
+		fmt.Println("err", err)
+	}
+
+	if patientId > 0 {
+		db := readDb.Table("xt_schedule as x").Where("x.status = 1")
+		db = db.
+			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+			Preload("TreatmentMode", "status = 1").
+			Preload("Prescription", "status = 1 AND user_org_id = ? AND patient_id = ?", orgID, patientId).
+			Preload("AssessmentBeforeDislysis", "status = 1 AND  user_org_id = ? AND patient_id = ?", orgID, patientId).
+			Preload("AssessmentAfterDislysis", "status = 1 AND  user_org_id = ? AND patient_id = ? ", orgID, patientId).
+			Preload("MonitoringRecord", "status = 1 AND  user_org_id = ?  AND patient_id = ?", orgID, patientId).
+			Preload("DialysisOrder", "status = 1 AND user_org_id = ? AND patient_id = ?", orgID, patientId).
+			Preload("DialysisOrder.DeviceNumber", "status = 1 AND  org_id = ?", orgID).
+			Preload("MonitorPatients", "status = 1 AND user_org_id = ?", orgID).
+			Where("status = 1 AND user_org_id = ?", orgID)
+		if partition != 0 {
+			db = db.Where("partition_id = ? ", partition)
+		}
+
+		db = db.Where("schedule_date <= ? ", time.Now().Unix())
+
+		db = db.Where("patient_id = ?", patientId)
+		db = db.Order("schedule_date desc")
+		err := db.Find(&mds).Error
+		fmt.Println("err", err)
 	}
-	err := db.Find(&mds).Error
+
 	return mds, err
 }
 
@@ -1424,3 +1454,16 @@ func CreateHisGroupAdvice(orgId int64, advices []*models.HisGroupAdvice, groupNo
 	tx.Commit()
 	return
 }
+
+func GetDialysisCount(orgid int64, partitionid int64) (order []*models.BloodDialysisOrderCount, err error) {
+
+	db := XTReadDB().Table("xt_dialysis_order as o")
+	if partitionid == 0 {
+		db.Raw("select count(o.id) as count,o.patient_id from xt_dialysis_order as o left join xt_schedule as x on x.patient_id = o.patient_id where o.status =1 and o.user_org_id = ? and  x.schedule_date = o.dialysis_date and x.status = 1", orgid).Group("o.patient_id").Scan(&order)
+	}
+
+	if partitionid > 0 {
+		db.Raw("select count(o.id) as count,o.patient_id from xt_dialysis_order as o left join xt_schedule as x on x.patient_id = o.patient_id where o.status =1  and o.user_org_id = ? and x.partition_id = ? and  x.schedule_date = o.dialysis_date and x.status = 1", orgid, partitionid).Group("o.patient_id").Scan(&order)
+	}
+	return order, err
+}

service/stock_service.go

@@ -1155,11 +1155,20 @@ func FindAllStockInfo(orgId int64, page int64, limit int64, keyword string, star
 
 	db := readDb.Model(&models.StockInfo{})
 	if startime > 0 {
+
 		db = db.Preload("QueryWarehouseOutInfo", func(db *gorm.DB) *gorm.DB {
 			return db.Where("org_id = ? AND status = 1 and sys_record_time>=?", orgId, startime)
 		})
 	}
+
+	if startime == 0 || endtime == 0 {
+		db = db.Preload("QueryWarehouseOutInfo", func(db *gorm.DB) *gorm.DB {
+			return db.Where("org_id = ? AND status = 1", orgId)
+		})
+	}
+
 	if endtime > 0 {
+
 		db = db.Preload("QueryWarehouseOutInfo", func(db *gorm.DB) *gorm.DB {
 			return db.Where("org_id = ? AND status = 1 and sys_record_time<=?", orgId, endtime)
 		})
@@ -1167,19 +1176,36 @@ func FindAllStockInfo(orgId int64, page int64, limit int64, keyword string, star
 
 	db = db.Where("xt_good_information.org_id = ? AND xt_good_information.status = 1", orgId)
 	db = db.Group("xt_good_information.id")
-	db = db.Preload("QueryWarehousingInfo", func(db *gorm.DB) *gorm.DB {
-		return db.Where("org_id = ? AND status = 1", orgId)
-	})
+	if startime == 0 || endtime == 0 {
+		db = db.Preload("QueryWarehousingInfo", func(db *gorm.DB) *gorm.DB {
+			return db.Where("org_id = ? AND status = 1", orgId)
+		})
+	}
+
+	if startime > 0 {
+		db = db.Preload("QueryWarehousingInfo", func(db *gorm.DB) *gorm.DB {
+			return db.Where("org_id = ? AND status = 1 and ctime >= ?", orgId, startime)
+		})
+	}
+
+	if endtime > 0 {
+		db = db.Preload("QueryWarehousingInfo", func(db *gorm.DB) *gorm.DB {
+			return db.Where("org_id = ? AND status = 1 and ctime>=? and ctime <= ?", orgId, startime, endtime)
+		})
+	}
 
 	db = db.Preload("QuerySalesReturnInfo", "org_id = ? AND status = 1", orgId)
 
 	if startime == 0 || endtime == 0 {
-		db = db.Preload("QueryWarehouseOutInfo", func(db *gorm.DB) *gorm.DB {
-			return db.Where("org_id = ? AND status = 1", orgId)
-		})
+		db = db.Preload("QueryCancelStockInfo", "org_id = ? AND status = 1", orgId)
+	}
+	if startime > 0 {
+		db = db.Preload("QueryCancelStockInfo", "org_id = ? AND status = 1 and ctime >=?", orgId, startime)
+	}
+	if endtime > 0 {
+		db = db.Preload("QueryCancelStockInfo", "org_id = ? AND status = 1 and ctime >=? and ctime<=?", orgId, startime, endtime)
 	}
 
-	db = db.Preload("QueryCancelStockInfo", "org_id = ? AND status = 1", orgId)
 	db = db.Preload("GoodsType", "org_id = ? AND status = 1", orgId)
 
 	if len(keyword) > 0 {
@@ -2098,3 +2124,42 @@ func GetStockType(orgid int64) (goodstype []*models.GoodsTypeOne, err error) {
 		Preload("GoodInfo", "org_id = ? and status = 1", orgid).Find(&goodstype).Error
 	return goodstype, err
 }
+
+func GetDialyStockOut(orgid int64, recordtime int64, patientId int64) (prepare []*models.XtDialysisBeforePrepare, err error) {
+
+	db := XTReadDB().Table("dialysis_before_prepare as x").Where("x.status = 1")
+	if orgid > 0 {
+		db = db.Where("x.user_org_id = ?", orgid)
+	}
+	if recordtime > 0 {
+		db = db.Where("x.record_date = ?", recordtime)
+	}
+	if patientId > 0 {
+		db = db.Where("x.patient_id = ?", patientId)
+	}
+	err = db.Select("x.id,x.user_org_id,x.patient_id,x.record_date,x.good_id,x.good_type_id,x.count,x.commdity_code,t.specification_name").Joins("left join xt_good_information as t on t.id = x.good_id and t.org_id = ? and t.status = 1", orgid).Scan(&prepare).Error
+	return prepare, err
+}
+
+func GetAutoReduceRecordInfoById(orgid int64, recordtime int64, goodid int64, goodtypeid int64) (*models.XtAutomaticReduceDetail, error) {
+
+	detail := models.XtAutomaticReduceDetail{}
+	err := XTReadDB().Model(&detail).Where("org_id = ? and record_time = ? and good_id = ? and good_type_id = ? and status =1", orgid, recordtime, goodid, goodtypeid).Find(&detail).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+
+	if err != nil {
+		return nil, err
+	}
+
+	return &detail, nil
+}
+
+func GetOutStockTotalCount(wareouttime int64, orgid int64) (autoMatic []*models.NewXtAutomaticReduceDetail, err error) {
+
+	err = XTReadDB().Raw("SELECT good_id,SUM(b.count) as count FROM (SELECT DISTINCT x.patient_id,x.good_id,x.count FROM xt_automatic_reduce_detail as x WHERE x.org_id = ? and x.record_time = ? and `status` = 1)  as b GROUP BY good_id", orgid, wareouttime).Scan(&autoMatic).Error
+
+	return autoMatic, err
+
+}