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

conf/app.conf

@@ -1,6 +1,6 @@
 appname = 血透
 httpport = 9531
-runmode = dev
+runmode = prod
 #dev/prod
 
 #

controllers/public_api_controller.go

@@ -75,6 +75,7 @@ func PublicApiRegistRouters() {
 	beego.Router("/handleExportData10138", &PublicApiController{}, "get:HandleExportData10138")
 
 	beego.Router("/handleData10265", &PublicApiController{}, "get:HandleData10265")
+	//beego.Router("/handleData10265two", &PublicApiController{}, "get:HandleData10265two")
 
 	beego.Router("/handleData10106", &PublicApiController{}, "get:HandleData10106")
 	beego.Router("/handleData10318", &PublicApiController{}, "get:HandleData10318")
@@ -92,6 +93,33 @@ func PublicApiRegistRouters() {
 	//
 	//beego.Router("/hande10138", &PublicApiController{}, "get:HandleOrderInfoData10138")
 
+	//935887
+
+	beego.Router("/handle10210", &PublicApiController{}, "get:Handle10210")
+
+	beego.Router("/handle10210", &PublicApiController{}, "get:Handle10210")
+
+	//beego.Router("/handle10028", &PublicApiController{}, "get:Handle10028")
+
+	beego.Router("/handleTeamData", &PublicApiController{}, "get:HandleTeamData")
+
+}
+
+func (c *PublicApiController) HandleTeamData() {
+
+	teams, _ := service.GetAllProjectTeam(10191)
+	var hisProjectList []*models.XtHisProjectList
+	for _, item := range teams {
+		ids := strings.Split(item.ItemId, ",")
+		project, _ := service.GetProjectHisListByIds(ids)
+		for _, sp := range project {
+			sp.PN = item.ProjectTeam
+		}
+		hisProjectList = append(hisProjectList, project...)
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"ps": hisProjectList,
+	})
 }
 
 type ResultFiveT struct {
@@ -113,6 +141,85 @@ func (c *PublicApiController) HandleSchedule() {
 
 }
 
+//func (c *PublicApiController) Handle10028() {
+//	HisPrescriptionTemplates, _ := service.GetHisPrescriptionTemplatesListTwo()
+//	for _, item := range HisPrescriptionTemplates {
+//		prescription, _ := service.GetHisPrescriptionTemplatetwo(item.ID)
+//		for _, subitem := range prescription {
+//			subitem.Status = 1
+//			service.CreateHisPrescriptionInfoTemplate(subitem)
+//		}
+//	}
+//
+//}
+
+func (c *PublicApiController) Handle10210() {
+
+	doctor_advices, _ := service.GetHisDoctorAdviceInfothree(10210, 1683561600)
+	for _, item := range doctor_advices {
+		strs := strings.Split(item.FeedetlSn, "-")
+		news := strs[0] + "-" + strs[1] + "-" + strconv.FormatInt(item.ID, 10)
+		item.FeedetlSn = news
+		service.SaveHisDoctorAdvice(item)
+	}
+
+	projects, _ := service.GetHisPrescriptionProjectByIDFour(10210, 1683561600)
+	for _, item := range projects {
+		strs := strings.Split(item.FeedetlSn, "-")
+		news := strs[0] + "-" + strs[1] + "-" + strconv.FormatInt(item.ID, 10)
+		item.FeedetlSn = news
+		service.SaveHisProject(item)
+	}
+
+	//doctor, _ := service.GetHisDoctorAdviceInfotwo(935886)
+	//index := 0
+	//total := 100
+	//for index = 0; index < total; index++ {
+	//	doctor.ID = 0
+	//	service.SaveHisDoctorAdvice(&doctor)
+	//}
+
+	//doctor2, _ := service.GetHisDoctorAdviceInfotwo(935887)
+	//index2 := 0
+	//total2 := 100
+	//for index2 = 0; index2 < total2; index2++ {
+	//	doctor2.ID = 0
+	//	service.SaveHisDoctorAdvice(&doctor2)
+	//}
+
+	//p, _ := service.GetHisPrescriptionProjectByID(2242486)
+	//index3 := 0
+	//total3 := 50
+	//for index3 = 0; index3 < total3; index3++ {
+	//	p.ID = 0
+	//	service.SaveHisProject(&p)
+	//}
+
+	//p2, _ := service.GetHisPrescriptionProjectByIDThree(2242487)
+	//index4 := 0
+	//total4 := 100
+	//for index4 = 0; index4 < total4; index4++ {
+	//	p2.ID = 0
+	//	service.SaveHisProject(&p2)
+	//}
+	//
+	//p3, _ := service.GetHisPrescriptionProjectByIDThree(2242488)
+	//index5 := 0
+	//total5 := 100
+	//for index5 = 0; index5 < total5; index5++ {
+	//	p3.ID = 0
+	//	service.SaveHisProject(&p3)
+	//}
+	//
+	//p4, _ := service.GetHisPrescriptionProjectByIDThree(2242489)
+	//index6 := 0
+	//total6 := 100
+	//for index6 = 0; index6 < total6; index6++ {
+	//	p4.ID = 0
+	//	service.SaveHisProject(&p4)
+	//}
+}
+
 func (c *PublicApiController) HandleOne() {
 	//fmt.Println("~~~~~~")
 	//start_time := c.GetString("start_time")
@@ -2378,6 +2485,43 @@ func (c *PublicApiController) HandleData10265() {
 
 }
 
+//func (c *PublicApiController) HandleData10265two() {
+//	orders, _ := service.GetHisOrder10265two()
+//	for _, items := range orders {
+//		if items.AdviceId == 0 && items.ProjectId > 0 {
+//			p, _ := service.GetHisPrescriptionProjectByIDTwoone(items.ProjectId)
+//			if p.Type == 2 {
+//				if p.HisProject.MedicalCoverage == 1 {
+//					items.ChrgitmLv = "01"
+//				} else if p.HisProject.MedicalCoverage == 2 {
+//					items.ChrgitmLv = "02"
+//				} else {
+//					items.ChrgitmLv = "03"
+//				}
+//			} else {
+//				if p.GoodInfo.MedicalInsuranceLevel == 1 {
+//					items.ChrgitmLv = "01"
+//				} else if p.GoodInfo.MedicalInsuranceLevel == 2 {
+//					items.ChrgitmLv = "02"
+//				} else {
+//					items.ChrgitmLv = "03"
+//				}
+//			}
+//		}
+//		if items.AdviceId > 0 && items.ProjectId == 0 {
+//			info, _ := service.GetHisDoctorAdviceInfo(items.AdviceId)
+//			if info.Drug.MedicalInsuranceLevel == 1 {
+//				items.ChrgitmLv = "01"
+//			} else if info.Drug.MedicalInsuranceLevel == 2 {
+//				items.ChrgitmLv = "02"
+//			} else {
+//				items.ChrgitmLv = "03"
+//			}
+//		}
+//		service.SaveOrderInfo(items)
+//	}
+//}
+
 //func (c *PublicApiController) HandleOrderInfoData() {
 //	orders, _ := service.GetHisOrderInfoDetail()
 //	c.ServeSuccessJSON(map[string]interface{}{

main.go

@@ -3,6 +3,7 @@ package main
 import (
 	_ "XT_New/routers"
 	"XT_New/service"
+	"encoding/xml"
 	"github.com/astaxie/beego"
 )
 
@@ -23,14 +24,74 @@ func main() {
 	//beego.BConfig.WebConfig.Session.SessionGCMaxLifetime = 6000
 	//beego.BConfig.WebConfig.AutoRender = false
 	//
-	//fmt.Println(0 % 4)
-	//fmt.Println(1 % 4)
-	//fmt.Println(2 % 4)
-	//fmt.Println(3 % 4)
-	//fmt.Println(4 % 4)
-	//fmt.Println(5 % 4)
-	//fmt.Println(6 % 4)
-	//fmt.Println(7 % 4)
 
 	beego.Run()
+
+}
+
+type Envelope struct {
+	XMLName xml.Name `xml:"soap:Envelope"`
+	Soap    string   `xml:"xmlns:soap,attr"`
+	Xsi     string   `xml:"xmlns:xsi,attr"`
+	Xsd     string   `xml:"xmlns:xsd,attr"`
+	Body    Body     `xml:"soap:Body"`
+}
+
+type Body struct {
+	XMLName      xml.Name     `xml:"soap:Body"`
+	GetReportReq GetReportReq `xml:"GetReportList"`
+}
+
+type GetReportReq struct {
+	XMLName       xml.Name `xml:"http://tempuri.org/ GetReportList"`
+	Key           string   `xml:"key"`
+	BeginDateTime string   `xml:"BeginDateTime"`
+	EndDateTime   string   `xml:"EndDateTime"`
+	DateType      int      `xml:"DateType"`
+	PrintState    int      `xml:"PrintState"`
+}
+
+type EnvelopeTwo struct {
+	XMLName xml.Name     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Envelope"`
+	Body    EnvelopeBody `xml:"Body"`
+}
+
+type EnvelopeBody struct {
+	GetReportListResponse GetReportListResponse `xml:"GetReportListResponse"`
+}
+
+type GetReportListResponse struct {
+	XMLName             xml.Name `xml:"http://tempuri.org/ GetReportListResponse"`
+	GetReportListResult string   `xml:"GetReportListResult"`
+}
+
+type ReportData struct {
+	Res   int    `json:"Res"`
+	Error string `json:"Error"`
+	Data  []Data `json:"Data"`
+}
+
+type Data struct {
+	RecordID           string `json:"RecordID"`
+	PatientName        string `json:"PatientName"`
+	Sex                string `json:"Sex"`
+	Age                int    `json:"Age"`
+	AgeUnit            string `json:"AgeUnit"`
+	OfficeName         string `json:"OfficeName"`
+	BedCode            string `json:"BedCode"`
+	Barcode            string `json:"Barcode"`
+	CustomerBarcode    string `json:"CustomerBarcode"`
+	SampleCode         string `json:"SampleCode"`
+	SampleCategory     string `json:"SampleCategory"`
+	SampleDescription  string `json:"SampleDescription"`
+	Diagnostics        string `json:"Diagnostics"`
+	TakeSampleDateTime string `json:"TakeSampleDateTime"`
+	ReceiveDateTime    string `json:"ReceiveDateTime"`
+	AuditDateTime      string `json:"AuditDateTime"`
+	InspectDate        string `json:"InspectDate"`
+	SendDoctor         string `json:"SendDoctor"`
+	InspectDoctorName  string `json:"InspectDoctorName"`
+	AuditorName        string `json:"AuditorName"`
+	Instrument         string `json:"Instrument"`
+	Comment            string `json:"Comment"`
 }

service/app_version.go

@@ -679,6 +679,7 @@ func (HisPrescriptionProjectTen) TableName() string {
 }
 
 func GetHisPatient11111(orgid int64) (paitent []*models.HisHospitalCheckRecord, err error) {
+
 	err = XTReadDB().Model(&paitent).Where("user_org_id = ?  and status = 1 AND in_hosptial_time >= '2022-12-01 00:00:00' AND in_hosptial_time <= '2022-12-31 23:59:59'", orgid).Find(&paitent).Error
 	return paitent, err
 }

service/his_hospital_service.go

@@ -602,6 +602,7 @@ func GetHisInHospitalHistory(keyword string, startime int64, endtime int64, limi
 	if orgid > 0 {
 		db = db.Where("user_org_id = ?", orgid)
 	}
+
 	err = db.Count(&total).Offset(offset).Limit(limit).Order("id desc").Find(&hisPatient).Error
 	return hisPatient, total, err
 }