历史排班

controllers/dialysis_api_controller.go

@@ -360,6 +360,8 @@ func (c *DialysisApiController) PostPrescription() {
 	prescription_water, _ := c.GetFloat("prescription_water")
 	dialysis_strainer := c.GetString("dialysis_strainer")
 	chaptalization := c.GetString("chaptalization")
+	washing_time := c.GetString("washing_time")
+	warsh_count := c.GetString("warsh_count")
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.CurrentOrgId)
 
@@ -478,6 +480,8 @@ func (c *DialysisApiController) PostPrescription() {
 		PrescriptionWater:          prescription_water,
 		DialysisStrainer:           dialysis_strainer,
 		Chaptalization:             chaptalization,
+		WarshCount:                 warsh_count,
+		WashingTime:                washing_time,
 	}
 
 	//长沙南雅医院，自动生成抗凝剂的临时处方
@@ -1003,6 +1007,8 @@ func (c *DialysisApiController) PostSoulution() {
 	prescription_water, _ := c.GetFloat("prescription_water")
 	dialysis_strainer := c.GetString("dialysis_strainer")
 	chaptalization := c.GetString("chaptalization")
+	warsh_count := c.GetString("warsh_count")
+	washing_time := c.GetString("washing_time")
 	var prescription_doctor int64
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentAppId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 
@@ -1171,6 +1177,8 @@ func (c *DialysisApiController) PostSoulution() {
 		PrescriptionWater:          prescription_water,
 		DialysisStrainer:           dialysis_strainer,
 		Chaptalization:             chaptalization,
+		WarshCount:                 warsh_count,
+		WashingTime:                washing_time,
 	}
 
 	if prescription.Anticoagulant == 0 {
@@ -1377,6 +1385,8 @@ func (c *DialysisApiController) PostSoulution() {
 		PrescriptionWater:          prescribing_number,
 		DialysisStrainer:           dialysis_strainer,
 		Chaptalization:             chaptalization,
+		WarshCount:                 warsh_count,
+		WashingTime:                washing_time,
 	}
 
 	if solution.Anticoagulant == 0 {
@@ -2521,13 +2531,15 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		if dialysisFinish.ID == 0 {
 			service.CreateDialysisFinish(finish)
 		}
-		if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 10469 {
+		if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 10469 || adminUserInfo.CurrentOrgId == 10551 {
 			var dewater_amount float64
 			dewater_amount = 0
 			if dry_weight > 0 {
 				dewater_amount = weight_before - dry_weight - additional_weight
 
-				dewater_amount = dewater_amount * 1000
+				if adminUserInfo.CurrentOrgId != 10551 {
+					dewater_amount = dewater_amount * 1000
+				}
 
 				if dewater_amount <= 0 {
 					dewater_amount = 0
@@ -2827,8 +2839,11 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		dewater_amount = 0
 		if evaluation.DryWeight > 0 {
 			dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
-			if templateInfo.TemplateId == 17 || templateInfo.TemplateId == 22 || templateInfo.TemplateId == 21 || templateInfo.TemplateId == 34 {
-				dewater_amount = dewater_amount * 1000
+			if templateInfo.TemplateId == 17 || templateInfo.TemplateId == 22 || templateInfo.TemplateId == 21 || templateInfo.TemplateId == 34 || adminUserInfo.CurrentOrgId == 10551 {
+				if adminUserInfo.CurrentOrgId != 10551 {
+					dewater_amount = dewater_amount * 1000
+				}
+
 			}
 			if dewater_amount <= 0 {
 				dewater_amount = 0

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1808,6 +1808,8 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 	prescription_water, _ := c.GetFloat("prescription_water")
 	dialysis_strainer := c.GetString("dialysis_strainer")
 	chaptalization := c.GetString("chaptalization")
+	washing_time := c.GetString("washing_time")
+	warsh_count := c.GetString("warsh_count")
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
 
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
@@ -1968,6 +1970,8 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 		PrescriptionWater:          prescription_water,
 		DialysisStrainer:           dialysis_strainer,
 		Chaptalization:             chaptalization,
+		WashingTime:                washing_time,
+		WarshCount:                 warsh_count,
 	}
 
 	//查询最近透析准备表里是否存在 透析器 灌流器
@@ -3381,12 +3385,17 @@ func (this *DialysisAPIController) StartDialysis() {
 			}
 
 			//针对
-			if adminUserInfo.Org.Id == 10471 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10460 || adminUserInfo.Org.Id == 10551 {
+			if adminUserInfo.Org.Id == 10471 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10460 {
 
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 				ultrafiltration_rate = ultrafiltration_rate / 1000
 			}
 
+			if adminUserInfo.Org.Id == 10551 {
+				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 1000 / float64(totalMin) * 60 * 1000)
+				ultrafiltration_rate = ultrafiltration_rate / 1000
+			}
+
 		}
 	}
 
@@ -3680,6 +3689,8 @@ func (c *DialysisAPIController) PostSolution() {
 	prescription_water, _ := c.GetFloat("prescription_water")
 	dialysis_strainer := c.GetString("dialysis_strainer")
 	chaptalization := c.GetString("chaptalization")
+	washing_time := c.GetString("washing_time")
+	warsh_count := c.GetString("warsh_count")
 	if mode_id > 0 {
 
 		var str string
@@ -3838,6 +3849,8 @@ func (c *DialysisAPIController) PostSolution() {
 		PrescriptionWater:          prescription_water,
 		DialysisStrainer:           dialysis_strainer,
 		Chaptalization:             chaptalization,
+		WashingTime:                washing_time,
+		WarshCount:                 warsh_count,
 	}
 
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
@@ -3962,6 +3975,8 @@ func (c *DialysisAPIController) PostSolution() {
 		PrescriptionWater:          prescription_water,
 		DialysisStrainer:           dialysis_strainer,
 		Chaptalization:             chaptalization,
+		WashingTime:                washing_time,
+		WarshCount:                 warsh_count,
 	}
 
 	//针对河间咸的
@@ -4328,7 +4343,6 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 
 			totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
 			if (template.TemplateId == 6 || template.TemplateId == 65 || adminInfo.Org.Id == 10375) && adminInfo.Org.Id != 9538 {
-				fmt.Println("hahhdahahah")
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 				record.UltrafiltrationRate = ultrafiltration_rate
 
@@ -4392,13 +4406,18 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 
 			}
 
-			if adminInfo.Org.Id == 10460 || adminInfo.Org.Id == 10551 {
+			if adminInfo.Org.Id == 10460 {
 
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 				record.UltrafiltrationRate = ultrafiltration_rate / 1000
 
 			}
 
+			if adminInfo.Org.Id == 10551 {
+				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 1000 / float64(totalMin) * 60 * 1000)
+				record.UltrafiltrationRate = ultrafiltration_rate / 1000
+			}
+
 			//if template.TemplateId == 47 {
 			//	ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / float64(totalMin))
 			//	record.UltrafiltrationRate = ultrafiltration_rate
@@ -4442,8 +4461,14 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		record.UltrafiltrationVolume = ultrafiltration_volume / 1000
 	}
 
-	if adminInfo.Org.Id == 10460 || adminInfo.Org.Id == 10551 {
+	if adminInfo.Org.Id == 10460 {
+
+		ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
+
+		record.UltrafiltrationVolume = ultrafiltration_volume / 1000
+	}
 
+	if adminInfo.Org.Id == 10551 {
 		ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
 
 		record.UltrafiltrationVolume = ultrafiltration_volume / 1000

controllers/mobile_api_controllers/patient_api_controller.go

@@ -2602,8 +2602,11 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 	if evaluation.DryWeight > 0 {
 		dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
 
-		if template.TemplateId == 17 || template.TemplateId == 22 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 34 || template.TemplateId == 32 || adminUserInfo.Org.Id == 10469 || adminUserInfo.Org.Id == 3877 {
-			dewater_amount = dewater_amount * 1000
+		if template.TemplateId == 17 || template.TemplateId == 22 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 34 || template.TemplateId == 32 || adminUserInfo.Org.Id == 10469 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10551 {
+
+			if adminUserInfo.Org.Id != 10551 {
+				dewater_amount = dewater_amount * 1000
+			}
 
 		}
 

controllers/sign_api_controller.go

@@ -79,6 +79,9 @@ func SignApiRegistRouters() {
 	//发送消息
 	beego.Router("/api/device/createskdsendinformation", &SignApiController{}, "Post:CreateSdkSendInformation")
 
+	//删除
+	beego.Router("/api/device/tosavepdfinformation", &SignApiController{}, "Post:SavePdfInformation")
+
 }
 
 // 短信服务接口
@@ -652,3 +655,13 @@ func (this *SignApiController) CreateSdkSendInformation() {
 		"orderId":     orderId,
 	})
 }
+
+func (this *SignApiController) SavePdfInformation() {
+
+	information, orderId := service.SavePdfInformation()
+	this.ServeSuccessJSON(map[string]interface{}{
+		"information": information,
+		"orderId":     orderId,
+	})
+
+}

models/patient_models.go

@@ -376,6 +376,8 @@ type DialysisPrescription struct {
 	PrescriptionWater          float64       `gorm:"column:prescription_water" json:"prescription_water" form:"prescription_water"`
 	DialysisStrainer           string        `gorm:"column:dialysis_strainer" json:"dialysis_strainer" form:"dialysis_strainer"`
 	Chaptalization             string        `gorm:"column:chaptalization" json:"chaptalization" form:"chaptalization"`
+	WarshCount                 string        `gorm:"column:warsh_count" json:"warsh_count" form:"warsh_count"`
+	WashingTime                string        `gorm:"column:washing_time" json:"washing_time" form:"washing_time"`
 }
 
 func (DialysisPrescription) TableName() string {
@@ -594,6 +596,8 @@ type DialysisSolution struct {
 	PrescriptionWater          float64 `gorm:"column:prescription_water" json:"prescription_water" form:"prescription_water"`
 	DialysisStrainer           string  `gorm:"column:dialysis_strainer" json:"dialysis_strainer" form:"dialysis_strainer"`
 	Chaptalization             string  `gorm:"column:chaptalization" json:"chaptalization" form:"chaptalization"`
+	WarshCount                 string  `gorm:"column:warsh_count" json:"warsh_count" form:"warsh_count"`
+	WashingTime                string  `gorm:"column:washing_time" json:"washing_time" form:"washing_time"`
 }
 
 func (DialysisSolution) TableName() string {

service/manage_service.go

@@ -1793,7 +1793,14 @@ func DeleteObjectTableDisinfect(id int64) error {
 
 func GetAirDisInfectionLongTime(user_org_id int64, storey string) (list []*models.XtNewAriDisinfect, err error) {
 
-	err = XTReadDB().Where("user_org_id = ? and status = 1 and storey = ?", user_org_id, storey).Order("id desc").First(&list).Error
+	db := XTReadDB().Model(&list).Where("status =1")
+	if user_org_id > 0 {
+		db = db.Where("user_org_id =?", user_org_id)
+	}
+	if len(storey) > 0 {
+		db = db.Where("storey =?", storey)
+	}
+	err = db.Order("id desc").First(&list).Error
 	return
 }
 

service/sign_service.go

@@ -1658,3 +1658,143 @@ func CreateSdkSendInformation() (string, string) {
 	//fmt.Println("str", orderId)
 	return str, orderId
 }
+
+func SavePdfInformation() (string, string) {
+
+	var url string
+
+	url = "http://localhost:8890/sdk/pdf/sign"
+	maprequest := make(map[string]interface{})
+
+	Receiver := make(map[string]interface{})
+
+	//业务单号
+	maprequest["orderId"] = "13318464642"
+
+	//合同标题
+	maprequest["signType"] = "pdf"
+
+	file := "C:/Users/28169/Desktop/2.pdf"
+
+	fileBytes, err := ioutil.ReadFile(file) // 读取file
+
+	contractBase64 := base64.StdEncoding.EncodeToString(fileBytes) // 加密成base64字符串
+	//文件获取方式
+	maprequest["fileType"] = contractBase64
+	//合同内容
+	maprequest["fileContent"] = "绝密文件"
+
+	//签署用户人ID
+	maprequest["userId"] = ""
+
+	//业务单号
+	maprequest["receiver"] = Receiver
+
+	//签署人账号
+	Receiver["account"] = "13318464642"
+	//签署个人类型 1.个人 2.企业
+	Receiver["signerType"] = 1
+
+	//签署人姓名
+	Receiver["realName "] = "马文强"
+
+	// 证件类型
+	Receiver["cardType"] = 0
+
+	//证件编码
+	Receiver["cardNumber"] = "430526199408156511"
+
+	stepStamper := make([]map[string]interface{}, 0)
+
+	keywordSignControls := make(map[string]interface{})
+
+	keywordSignControls["sealName"] = "1"
+	keywordSignControls["keyword"] = ""
+	keywordSignControls["pages"] = "0"
+	keywordSignControls["offsetX"] = "100"
+	keywordSignControls["offsetY"] = "100"
+
+	stepStamper = append(stepStamper, keywordSignControls)
+
+	crossSignControls := make(map[string]interface{})
+	crossSignControls["sealName"] = "2"
+	crossSignControls["positionX"] = "100"
+	crossSignControls["positionY"] = "100"
+	stepStamper = append(stepStamper, crossSignControls)
+
+	xySignControls := make(map[string]interface{})
+	xySignControls["sealName"] = "2"
+	xySignControls["positionX"] = "100"
+	xySignControls["positionY"] = "100"
+
+	stepStamper = append(stepStamper, xySignControls)
+
+	maprequest["stepStamper"] = stepStamper
+
+	seals := make([]map[string]interface{}, 0)
+	sealImages := make(map[string]interface{})
+	sealImages["sealBase64"] = "2"
+	sealImages["width"] = "100"
+	sealImages["height"] = "100"
+	sealImages["verticalAlign"] = "middle"
+
+	sealTexts := make(map[string]interface{})
+	sealTexts["text"] = "2"
+	sealTexts["fontSize"] = "100"
+	sealTexts["fontColor"] = "100"
+	sealTexts["isTextArea"] = true
+	sealTexts["textAlign"] = 0
+	sealTexts["width"] = 300
+	sealTexts["height"] = 300
+
+	maprequest["seals"] = seals
+
+	maprequest["isUserWishes"] = true
+	maprequest["phone"] = "13318464642"
+	maprequest["verificationCode"] = "18888888888"
+
+	byterequest, _ := json.Marshal(maprequest)
+
+	appId := beego.AppConfig.String("sign_appid")
+
+	serviceKye := beego.AppConfig.String("serviceKye")
+
+	reader := bytes.NewReader(byterequest)
+	serviceCode := beego.AppConfig.String("serviceCode")
+	signatureStr, _ := generateHMACSHA1SignatureOne(maprequest, serviceKye, serviceCode)
+
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+	}
+	fmt.Println("请求参数", request)
+	fmt.Println("Content-Signature", signatureStr)
+
+	request.Header.Set("appId", appId)
+	request.Header.Set("appKey", serviceKye)
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("Content-Signature", signatureStr)
+	client := http.Client{}
+
+	resp, err := client.Do(request)
+
+	if err != nil {
+		fmt.Println(err.Error())
+
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+
+	}
+	str := string(respBytes)
+
+	var respJSON map[string]interface{}
+	if err := json.Unmarshal([]byte(string(respBytes)), &respJSON); err != nil {
+		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+	}
+	var orderId string
+	//orderId = respJSON["data"].(map[string]interface{})["orderId"].(string)
+	//fmt.Println("str", orderId)
+	return str, orderId
+}