历史排班

conf/app.conf

@@ -152,6 +152,10 @@ sso_domain = https://testsso.sgjyun.com
 call_domain = http://hf.szjkhd.com
 front_end_domain = "http://xt.test.sgjyun.com/#"
 
+sign_appid ="eac17a142dd046"
+serviceKye = "da8b09dce3684e6ebfbb7f70dba707a0"
+serviceCode ="msg0001"
+
 readmysqlhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 readmysqlport = 3306
 readmysqluser = root

controllers/dialysis_api_controller.go

@@ -4168,6 +4168,8 @@ func (c *DialysisApiController) GetDialysisOrder() {
 	prescriptionInfo, _ := service.GetPrescriptionInfo(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
 
 	patientDiagnose, _ := service.FindPatientDianose(adminUserInfo.CurrentOrgId)
+
+	lastSchedule, _ := service.FindLastSchedule(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
 	//if config.IsOpen == 1 && project_config.IsOpen == 1 && len(projects) > 0 {
 	//	for _, item := range projects {
 	//		var advice *models.HisDoctorAdviceInfo
@@ -4225,6 +4227,7 @@ func (c *DialysisApiController) GetDialysisOrder() {
 			"projects":                  projects,
 			"prescriptionInfo":          prescriptionInfo,
 			"patientDiagnose":           patientDiagnose,
+			"lastSchedule":              lastSchedule,
 		})
 
 	}
@@ -4264,6 +4267,7 @@ func (c *DialysisApiController) GetDialysisOrder() {
 			"projects":                  projects,
 			"prescriptionInfo":          prescriptionInfo,
 			"patientDiagnose":           patientDiagnose,
+			"lastSchedule":              lastSchedule,
 		})
 	}
 

controllers/inspection_api_controller.go

@@ -845,6 +845,7 @@ func (c *InspectionApiController) GetPatientInspections() {
 
 	adminUserInfo := c.GetAdminUserInfo()
 	inspections, total, dateTime, err := service.GetPatientInspections(adminUserInfo.CurrentOrgId, patient, projectId, page)
+	fmt.Println("inspections", inspections)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -92,7 +92,7 @@ func (this *DialysisAPIController) Scheduals() {
 	patients, _ := service.GetAllPatientListSix(orgID)
 	if len(scheduals_json_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
 		scheduals, err := service.MobileGetDialysisScheduals(orgID, date.Unix(), schedualType)
-
+		fmt.Println("len2223o32o23o23owo", len(scheduals))
 		if err != nil {
 			this.ErrorLog("获取排班信息失败:%v", err)
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -106,6 +106,7 @@ func (this *DialysisAPIController) Scheduals() {
 				treatmentSummarys, _ := service.GetAllTreatmentSummarysByList(orgID, date.Unix())
 				AssessmentAfterDislysis, _ := service.GetAllAssessmentAfterDislysisByList(orgID, date.Unix())
 				dobulecheck, _ := service.GetAllDobuleCheckList(orgID, date.Unix())
+				fmt.Println("dobulecheck", dobulecheck)
 				hisAdvices, _ := service.GetAllHisAdvicesByList(orgID, date.Unix())
 				inforMation, _ := service.GetTodayInforMation(orgID, date.Unix())
 				for key, item := range scheduals {
@@ -973,10 +974,13 @@ func (c *DialysisAPIController) PostDoubleCheck() {
 
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":double_check"
 		redis := service.RedisClient()
-
-		defer redis.Close()
 		//清空key 值
 		redis.Set(key, "", time.Second)
+		keyOne := "scheduals_" + recordDateStr + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
+
+		redis.Set(keyOne, "", time.Second)
+		defer redis.Close()
+
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"doubleCheck": &doubleCheck,
@@ -1054,9 +1058,15 @@ func (c *DialysisAPIController) PostDoubleCheck() {
 
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":double_check"
 		redis := service.RedisClient()
-		defer redis.Close()
 		//清空key 值
 		redis.Set(key, "", time.Second)
+
+		keyOne := "scheduals_" + recordDateStr + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
+
+		redis.Set(keyOne, "", time.Second)
+
+		defer redis.Close()
+
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"doubleCheck": &doubleCheck,

controllers/mobile_api_controllers/patient_api_controller.go

@@ -3794,7 +3794,7 @@ func (c *PatientApiController) GetPatientMonitor() {
 	adminInfo := c.GetMobileAdminUserInfo()
 	orgID := adminInfo.Org.Id
 	monitor, err := service.GetMonitorRecord(orgID, theStartTime, partition, patient_id)
-	fmt.Println("monitor-------------------", monitor)
+
 	if err != nil {
 		c.ErrorLog("获取排班信息失败:%v", err)
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -3894,14 +3894,14 @@ func (c *PatientApiController) GetPatientMonitor() {
 	}
 
 	//获取患者的透析次数
-	count, err := service.GetDialysisCount(orgID, partition)
+	//count, err := service.GetDialysisCount(orgID, partition)
 
 	patients, err := service.GetAllpatientThirty(orgID)
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
-			"monitor":      monitor,
-			"patientCount": count,
-			"patients":     patients,
+			"monitor": monitor,
+			//"patientCount": count,
+			"patients": patients,
 		})
 	} else {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
@@ -4072,11 +4072,13 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
 
 	//临时医嘱
 	DoctorAdvice, _ := service.FindDoctorAdviceOrderById(adminUserInfo.Org.Id, patientInfo.ID, xttime)
-	fmt.Println("DoctorAdvice3223323323232323223323323223332232332wode", DoctorAdvice)
+
 	hisAdvice, err := service.GetHisDoctorPatientById(adminUserInfo.Org.Id, patientInfo.ID, xttime)
 	config, err := service.GetHisDoctorConfig(adminUserInfo.Org.Id)
 
 	project_config, _ := service.GetHisProjectConfig(adminUserInfo.Org.Id)
+
+	lastSchedule, _ := service.FindLastSchedule(adminUserInfo.Org.Id, patientInfo.ID, xttime)
 	projects, _ := service.FindAllHisProjectById(adminUserInfo.Org.Id, patientInfo.ID, xttime)
 	if config.IsOpen == 1 && project_config.IsOpen == 1 && len(projects) > 0 {
 		for _, item := range projects {
@@ -4156,6 +4158,7 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
 			"projects":                projects,
 			"project_config":          project_config,
 			"lastWeight":              lastWeight,
+			"lastSchedule":            lastSchedule,
 		})
 	}
 
@@ -4179,6 +4182,7 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
 			"projects":                projects,
 			"project_config":          project_config,
 			"lastWeight":              lastWeight,
+			"lastSchedule":            lastSchedule,
 		})
 	}
 

controllers/print_data_api_controller.go

@@ -93,10 +93,14 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 				item.Count = list.Count
 			}
 
+			lastSchedule, _ := service.FindLastSchedule(this.GetAdminUserInfo().CurrentOrgId, item.PatientID, item.ScheduleDate)
+
+			item.Schedule = &lastSchedule
+
 			if this.GetAdminUserInfo().CurrentOrgId == 10101 || this.GetAdminUserInfo().CurrentOrgId == 9671 || this.GetAdminUserInfo().CurrentOrgId == 10345 || this.GetAdminUserInfo().CurrentOrgId == 9970 || this.GetAdminUserInfo().CurrentOrgId == 10495 {
 
 				if item.ScheduleDate <= 1672416000 {
-					fmt.Print("进来1")
+
 					listOne, _ := service.GetDialysisOrderCountEight(adminUserInfo.CurrentOrgId, item.PatientID, item.ScheduleDate)
 
 					item.Patient.TotalDialysis = listOne.Count
@@ -104,9 +108,9 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 				}
 
 				if item.ScheduleDate >= 1672502400 {
-					fmt.Print("进来2")
+
 					listOne, _ := service.GetDialysisOrderCountNight(adminUserInfo.CurrentOrgId, item.PatientID, item.ScheduleDate)
-					fmt.Println("listOne2322332", listOne.Count)
+
 					item.Patient.TotalDialysis = listOne.Count
 					item.Count = listOne.Count
 				}
@@ -155,6 +159,9 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 				}
 
 			}
+			lastSchedule, _ := service.FindLastSchedule(this.GetAdminUserInfo().CurrentOrgId, item.PatientID, item.ScheduleDate)
+
+			item.Schedule = &lastSchedule
 			if this.GetAdminUserInfo().CurrentOrgId == 10101 || this.GetAdminUserInfo().CurrentOrgId == 9671 || this.GetAdminUserInfo().CurrentOrgId == 10345 {
 				//listOne, _ := service.GetDialysisOrderCountEight(adminUserInfo.CurrentOrgId, item.PatientID, item.ScheduleDate)
 
@@ -175,6 +182,7 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 					item.Count = listOne.Count
 				}
 			}
+
 		}
 		if getScheduleErr != nil {
 			this.ErrorLog("获取打印透析记录失败：%v", getScheduleErr)

controllers/sign_api_controller.go

@@ -19,11 +19,23 @@ func SignApiRegistRouters() {
 	//创建个人用户并实名
 	beego.Router("/api/sign/createrusername", &SignApiController{}, "Get:CreateUserName")
 
+	//创建企业用户并实名
+	beego.Router("/api/sign/createenterpriserealname", &SignApiController{}, "Get:CreateEnterPriseRealName")
+
+	//添加企业成员
+	beego.Router("/api/sign/createuserid", &SignApiController{}, "Get:CreateUserId")
+
 	//创建个人印章
 	beego.Router("/api/sign/createpersionseal", &SignApiController{}, "Get:CreatePersionSeal")
 
 	//上传文件创建创建合同
 	beego.Router("/api/sign/createuploadpact", &SignApiController{}, "Get:CreateUploadPact")
+
+	//添加合同签署人
+	beego.Router("/api/sign/addcontractsignatory", &SignApiController{}, "Get:AddContractSignatory")
+
+	//beego.Router("/api/sign/contractsignatory", &SignApiController{}, "Get:CreateSignTest")
+	beego.Router("/api/sign/contractsignatory", &SignApiController{}, "Get:CreateContractsignatory")
 }
 
 // 短信服务接口
@@ -150,3 +162,52 @@ func (this *SignApiController) CreateUploadPact() {
 	})
 	return
 }
+
+// 添加企业成员
+func (this *SignApiController) CreateUserId() {
+
+	userId := this.GetString("userId")
+	displayName := this.GetString("displayName")
+
+	sign := service.CreateUserId(userId, displayName)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"sign": sign,
+	})
+	return
+
+}
+
+func (this *SignApiController) CreateEnterPriseRealName() {
+
+	enterprisename := this.GetString("enterprisename")
+
+	sign := service.CreateEnterPriseRealName(enterprisename)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"sign": sign,
+	})
+	return
+}
+
+func (this *SignApiController) AddContractSignatory() {
+
+	contractId := this.GetString("contractId")
+
+	signers := this.GetString("signers")
+
+	service.AddContractSignatory(contractId, signers)
+}
+
+func (this *SignApiController) CreateContractsignatory() {
+
+	list, _ := service.GetHisDoctorAdviceInfoList(10215)
+
+	for _, item := range list {
+		service.UpdatePatietPrice(item.ID, item.RetailPrice)
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"sign": "msg",
+	})
+	return
+}

models/sign.models.go

@@ -0,0 +1,63 @@
+package models
+
+type NewContract struct {
+	ContractId string `json:"contractId"`
+	signers    []struct {
+		UserId       string `json:"userId"`
+		SignerType   int64  `json:"signerType"`
+		EnterpriseId string `json:"enterpriseId"`
+		Sequence     string `json:"sequence"`
+		SendMsg      string `json:"sendMsg"`
+		SignFiles    []struct {
+			DocId          float64 `json:"343465645"`
+			XySignControls []struct {
+				Key       string `json:"key"`
+				Type      string `json:"type"`
+				PageNum   string `json:"pageNum"`
+				PositionX string `json:"positionX"`
+				positionY string `json:"positionY"`
+			} `json:"xySignControls"`
+			KeywordSignControls []struct {
+				Key       string `json:"key"`
+				Type      string `json:"type"`
+				PageNum   string `json:"pageNum"`
+				PositionX string `json:"positionX"`
+				positionY string `json:"positionY"`
+			} `json:"keywordSignControls"`
+		} `json:"signFiles"`
+	}
+}
+
+type XySignControls struct {
+	Key       string `json:"key"`
+	Type      string `json:"type"`
+	PageNum   string `json:"pageNum"`
+	PositionX string `json:"positionX"`
+	positionY string `json:"positionY"`
+}
+
+type KeywordSignControls struct {
+	Key       string `json:"key"`
+	Type      string `json:"type"`
+	PageNum   string `json:"pageNum"`
+	PositionX string `json:"positionX"`
+	positionY string `json:"positionY"`
+}
+
+type SignFiles []struct {
+	DocId          float64 `json:"343465645"`
+	XySignControls []struct {
+		Key       string `json:"key"`
+		Type      string `json:"type"`
+		PageNum   string `json:"pageNum"`
+		PositionX string `json:"positionX"`
+		positionY string `json:"positionY"`
+	} `json:"xySignControls"`
+	KeywordSignControls []struct {
+		Key       string `json:"key"`
+		Type      string `json:"type"`
+		PageNum   string `json:"pageNum"`
+		PositionX string `json:"positionX"`
+		positionY string `json:"positionY"`
+	} `json:"keywordSignControls"`
+}

service/dialysis_service.go

@@ -2267,7 +2267,6 @@ func GetDialysisWatchByKeywordFlow(orgID int64, keyword string, schedulType int6
 func GetDialysisWatchFlow(orgID int64, schedulDate int64, schedulType int64, partitionType int64, page int64, limit int64, start int64, end int64) (schedule []*models.DialysisScheduleFlow, err error, total int64) {
 	db := readDb.Model(&models.DialysisScheduleFlow{})
 
-	fmt.Println("schedule_date--------------------", schedulDate)
 	if schedulDate > 0 {
 		db = db.Preload("DeviceNumber", "org_id = ?", orgID).
 			Preload("TreatmentMode", "status = 1").
@@ -2302,3 +2301,11 @@ func GetPrescriptionInfo(user_org_id int64, patient_id int64, record_date int64)
 	err := XTReadDB().Where("user_org_id = ? and patient_id =? and record_date = ? and status=1", user_org_id, patient_id, record_date).Find(&info).Error
 	return info, err
 }
+
+func FindLastSchedule(user_org_id int64, patient_id int64, schedule_date int64) (models.XtSchedules, error) {
+
+	schedules := models.XtSchedules{}
+	err := XTReadDB().Where("user_org_id = ? and patient_id = ? and schedule_date < ? and status =1", user_org_id, patient_id, schedule_date).Order("schedule_date desc").First(&schedules).Error
+
+	return schedules, err
+}

service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go

@@ -603,6 +603,7 @@ type ScheduleVM struct {
 	HisAdvices               []*models.HisDoctorAdviceInfo    `gorm:"ForeignKey:RecordDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"his_advices"`
 	HisPrescriptionProject   []*models.HisPrescriptionProject `gorm:"ForeignKey:RecordDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"his_project"`
 	Count                    int64
+	Schedule                 *models.XtSchedule `gorm:"ForeignKey:PatientID" json:"lastSchedule"`
 }
 
 func (ScheduleVM) TableName() string {
@@ -861,6 +862,7 @@ type ScheduleVMSix struct {
 	HisAdvices               []*models.HisDoctorAdviceInfo    `gorm:"ForeignKey:RecordDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"his_advices"`
 	HisPrescriptionProject   []*models.HisPrescriptionProject `gorm:"ForeignKey:RecordDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"his_project"`
 	Count                    int64
+	Schedule                 *models.XtSchedule `gorm:"ForeignKey:PatientID" json:"lastSchedule"`
 }
 
 func (ScheduleVMSix) TableName() string {

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

@@ -487,3 +487,11 @@ func GetAdminUserEsTwo(orgid int64) (admin []*models.UserAdminRoles, err error)
 	err = db.Select("x.id,x.admin_user_id,x.user_name,x.org_id,s.creator,s.url,s.hash").Joins("left join sgj_user_admin_electronic_signature as s on s.creator = x.admin_user_id").Where("x.org_id = ?", orgid).Scan(&admin).Error
 	return admin, err
 }
+
+func FindLastSchedule(user_org_id int64, patient_id int64, schedule_date int64) (models.XtSchedule, error) {
+
+	schedules := models.XtSchedule{}
+	err := p_service.XTReadDB().Where("user_org_id = ? and patient_id = ? and schedule_date < ? and status =1", user_org_id, patient_id, schedule_date).Order("schedule_date desc").First(&schedules).Error
+
+	return schedules, err
+}

service/sign_service.go

@@ -1,6 +1,7 @@
 package service
 
 import (
+	"XT_New/models"
 	"XT_New/utils"
 	"bytes"
 	"crypto/hmac"
@@ -272,7 +273,7 @@ func CreateUploadPact(contractcode string, contractname string, signcount int64,
 
 	maprequest := make(map[string]interface{})
 
-	maprequest["contractCode"] = "102020620701056856"
+	//maprequest["contractCode"] = "102020620701056856"
 
 	maprequest["contractName"] = "汽车购买交易合同"
 
@@ -287,9 +288,10 @@ func CreateUploadPact(contractcode string, contractname string, signcount int64,
 
 	maprequest["contractBase64"] = contractBase64
 
-	maprequest["creator"] = "1003"
+	//添加企业成员 里面的USERID
+	maprequest["creator"] = "DCBCD8QR2TU6B83XFF3FOHJL"
 
-	maprequest["enterpriseId"] = "1001"
+	maprequest["enterpriseId"] = "BRWAABXW3RUD4PGCYEQWRRK8"
 
 	maprequest["signValidDays"] = 90
 
@@ -327,3 +329,205 @@ func CreateUploadPact(contractcode string, contractname string, signcount int64,
 
 	return str
 }
+
+func CreateEnterPriseRealName(enterprisename string) string {
+
+	var url string
+
+	url = "http://demo.itruscloud.com/apigate/contractpaasapi/enterprise/createEnterpriseRealName"
+	appId := beego.AppConfig.String("sign_appid")
+
+	serviceKye := beego.AppConfig.String("serviceKye")
+
+	serviceCode := beego.AppConfig.String("serviceCode")
+
+	maprequest := make(map[string]interface{})
+
+	customerReq := make(map[string]interface{})
+	customerReq["idCardType"] = "N"
+	customerReq["idCardNum"] = "430526199408156511"
+
+	maprequest["enterpriseName"] = "深圳益森科技有限公司"
+	maprequest["authentication"] = true
+	maprequest["customerAuthReq"] = customerReq
+
+	fmt.Println("maprequest", maprequest)
+	byterequest, _ := json.Marshal(maprequest)
+
+	reader := bytes.NewReader(byterequest)
+
+	signatureStr, _ := generateHMACSHA1SignatureOne(maprequest, serviceKye, serviceCode)
+
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+	}
+
+	request.Header.Set("appId", appId)
+	request.Header.Set("serviceCode", serviceCode)
+	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)
+
+	return str
+}
+
+func CreateUserId(userId string, displayName string) string {
+
+	var url string
+
+	url = "http://demo.itruscloud.com/apigate/contractpaasapi/user/joinEnterprise"
+	appId := beego.AppConfig.String("sign_appid")
+
+	serviceKye := beego.AppConfig.String("serviceKye")
+
+	serviceCode := beego.AppConfig.String("serviceCode")
+
+	maprequest := make(map[string]interface{})
+
+	maprequest["enterpriseId"] = "BRWAABXW3RUD4PGCYEQWRRK8"
+	maprequest["userId"] = "DCBCD8QR2TU6B83XFF3FOHJL"
+
+	byterequest, _ := json.Marshal(maprequest)
+	reader := bytes.NewReader(byterequest)
+
+	signatureStr, _ := generateHMACSHA1SignatureOne(maprequest, serviceKye, serviceCode)
+
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+	}
+
+	request.Header.Set("appId", appId)
+	request.Header.Set("serviceCode", serviceCode)
+	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)
+
+	return str
+}
+
+//type ResultTwo struct {
+//	ErrMsg      string `json:"err_msg"`
+//	InfRefmsgid string `json:"inf_refmsgid"`
+//	Infcode     int64  `json:"infcode"`
+//	Output      struct {
+//		Baseinfo struct {
+//			Age         float64 `json:"age"`
+//			Brdy        string  `json:"brdy"`
+//			Certno      string  `json:"certno"`
+//			Gend        string  `json:"gend"`
+//			Naty        string  `json:"naty"`
+//			PsnCertType string  `json:"psn_cert_type"`
+//			PsnName     string  `json:"psn_name"`
+//			PsnNo       string  `json:"psn_no"`
+//		} `json:"baseinfo"`
+//		Idetinfo []interface{} `json:"idetinfo"`
+//		Iinfo    []struct {
+//			Balc                   float64 `json:"balc"`
+//			CvlservFlag            string  `json:"cvlserv_flag"`
+//			EmpName                string  `json:"emp_name"`
+//			InsuplcAdmdvs          string  `json:"insuplc_admdvs"`
+//			Insutype               string  `json:"insutype"`
+//			PausInsuDansuplcAdmdvs string  `json:"paus_insu_dansuplc_admdvs"`
+//			PausInsuDate           string  `json:"paus_insu_date"`
+//			PsnInsuDate            string  `json:"psn_insu_date"`
+//			PsnInsuStas            string  `json:"psn_insu_stas"`
+//			PsnType                string  `json:"psn_type"`
+//		} `json:"insuinfo"`
+//	} `json:"output"`
+//	RefmsgTime  string      `json:"refmsg_time"`
+//	RespondTime string      `json:"respond_time"`
+//	Signtype    interface{} `json:"signtype"`
+//	WarnInfo    interface{} `json:"warn_info"`
+//}
+
+func AddContractSignatory(contractId string, signers string) string {
+
+	var url string
+
+	url = "http://demo.itruscloud.com/apigate/contractpaasapi/contract/addSignerByFile"
+	appId := beego.AppConfig.String("sign_appid")
+
+	serviceKye := beego.AppConfig.String("serviceKye")
+
+	serviceCode := beego.AppConfig.String("serviceCode")
+
+	maprequest := make(map[string]interface{})
+
+	maprequest["contractId"] = "153497878806048027"
+
+	maprequest["signers"] = ""
+
+	var customs models.NewContract
+
+	customs.ContractId = ""
+
+	byterequest, _ := json.Marshal(maprequest)
+	reader := bytes.NewReader(byterequest)
+
+	signatureStr, _ := generateHMACSHA1SignatureOne(maprequest, serviceKye, serviceCode)
+
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+	}
+
+	request.Header.Set("appId", appId)
+	request.Header.Set("serviceCode", serviceCode)
+	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)
+
+	return str
+}
+
+func GetHisDoctorAdviceInfoList(user_org_id int64) (advice []*models.XtDrugWarehouseInfo, err error) {
+
+	err = XTReadDB().Where("status= 1 and is_check= 1").Find(&advice).Error
+
+	return advice, err
+}
+
+func UpdatePatietPrice(id int64, retail_price float64) (models.DrugFlow, error) {
+
+	flow := models.DrugFlow{}
+	err := XTWriteDB().Model(&flow).Where("warehousing_detail_id = ? and status=1", id).Updates(map[string]interface{}{"price": retail_price}).Error
+	return flow, err
+}

service/warhouse_service.go

@@ -161,6 +161,23 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 
 	stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
 
+	// 将该批次的剩余库存数量转换为拆零数量
+	if warehouse.MaxUnit == drup.MaxUnit && drup.MaxUnit != drup.MinUnit {
+
+		stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
+
+	}
+	if warehouse.MaxUnit == drup.MinUnit && drup.MaxUnit != drup.MinUnit {
+
+		stock_number = warehouse.StockMaxNumber + warehouse.StockMinNumber
+
+	}
+	if warehouse.MaxUnit == drup.MaxUnit && drup.MaxUnit == drup.MinUnit {
+
+		stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
+
+	}
+
 	//查找药品信息
 	//baseInfo, _ := FindBaseDrugLibRecord(advice.UserOrgId, advice.DrugId)
 
@@ -186,7 +203,19 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 			}
 		}
 
-		warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
+		if drup.MinUnit == warehouse.MaxUnit && drup.MaxUnit != drup.MinUnit {
+			//fmt.Println("金1")
+			warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber*drup.MinNumber
+		}
+
+		if drup.MaxUnit == warehouse.MaxUnit && drup.MaxUnit != drup.MinUnit {
+			//fmt.Println("金2")
+			warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
+		}
+		if drup.MaxUnit == warehouse.MaxUnit && drup.MaxUnit == drup.MinUnit {
+			//fmt.Println("金3")
+			warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
+		}
 
 		if warehouse.StockMaxNumber < 0 {
 			warehouse.StockMaxNumber = 0
@@ -198,25 +227,36 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 		warehouse.Mtime = time.Now().Unix()
 
 		if warehouse.StockMinNumber < minNumber {
-
+			//fmt.Println("金4")
 			warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
-			warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
+			if warehouse.MaxUnit != warehouse.MinUnit {
+				warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
+			}
 		} else {
+			//fmt.Println("金5")
 			if minNumber > 0 {
-				warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
+				if (warehouse.StockMinNumber - minNumber) >= 0 {
+					warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
+				}
+
 			}
 
 			if minNumber == 0 && maxNumber != 1 && warehouse.StockMaxNumber <= 0 {
+				//fmt.Println("6")
 				if warehouse.StockMinNumber > 0 {
-					warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+					if warehouse.StockMinNumber-deliver_number >= 0 {
+						warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+					}
+
 				}
 
 			}
 
 		}
 
-		if maxNumber == 1 && minNumber == 0 && drup.MaxUnit != drup.MinUnit {
-			if (warehouse.StockMinNumber - deliver_number) > 0 {
+		if maxNumber == 1 && minNumber == 0 && drup.MaxUnit != drup.MinUnit && warehouse.MaxUnit != warehouse.MinUnit {
+			if (warehouse.StockMinNumber - deliver_number) >= 0 {
+				//fmt.Println("金7")
 				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
 			}