Browse Source

Merge branch 'master' of http://git.shengws.com/csx/gdyb

csx 3 years ago
parent
commit
507e48d1ad
1 changed files with 25 additions and 25 deletions
  1. 25 25
      controllers/sg/his_api_controller.go

+ 25 - 25
controllers/sg/his_api_controller.go View File

@@ -735,34 +735,34 @@ func (c *HisApiController) GetSettleList() {
735 735
 	struct4101.CustomStruct = tempFunPays
736 736
 
737 737
 	var tempOpspdiseinfos []service.OpspdiseinfoStruct
738
-	//var tempOpspdiseinfo2 service.OpspdiseinfoStruct
738
+	var tempOpspdiseinfo2 service.OpspdiseinfoStruct
739 739
 	//sickConfig, _ := service.FindDiagnoseById(his.Diagnosis)
740 740
 
741
-	diagnosis_ids := strings.Split(his.Diagnosis, ",")
742
-	var config []*models.HisXtDiagnoseConfig
743
-	for _, item := range diagnosis_ids {
744
-		id, _ := strconv.ParseInt(item, 10, 64)
745
-		diagnosisConfig, _ := service.FindDiagnoseById(id)
746
-		config = append(config, &diagnosisConfig)
747
-	}
748
-
749
-	for _, item := range config {
750
-		var tempOpspdiseinfo service.OpspdiseinfoStruct
751
-		tempOpspdiseinfo.DiagCode = item.CountryCode
752
-		tempOpspdiseinfo.DiagName = item.CountryContentName
753
-		tempOpspdiseinfo.MaindiagFlag = "1"
754
-		tempOpspdiseinfo.OprnOprtCode = ""
755
-		tempOpspdiseinfo.OprnOprtName = ""
756
-		tempOpspdiseinfos = append(tempOpspdiseinfos, tempOpspdiseinfo)
757
-	}
741
+	//diagnosis_ids := strings.Split(his.Diagnosis, ",")
742
+	//var config []*models.HisXtDiagnoseConfig
743
+	//for _, item := range diagnosis_ids {
744
+	//	id, _ := strconv.ParseInt(item, 10, 64)
745
+	//	diagnosisConfig, _ := service.FindDiagnoseById(id)
746
+	//	config = append(config, &diagnosisConfig)
747
+	//}
748
+	//
749
+	//for _, item := range config {
750
+	//	var tempOpspdiseinfo service.OpspdiseinfoStruct
751
+	//	tempOpspdiseinfo.DiagCode = item.CountryCode
752
+	//	tempOpspdiseinfo.DiagName = item.CountryContentName
753
+	//	tempOpspdiseinfo.MaindiagFlag = "1"
754
+	//	tempOpspdiseinfo.OprnOprtCode = ""
755
+	//	tempOpspdiseinfo.OprnOprtName = ""
756
+	//	tempOpspdiseinfos = append(tempOpspdiseinfos, tempOpspdiseinfo)
757
+	//}
758 758
 
759
-	//sickConfigTwo, _ := service.FindSickById(his.SickType)
760
-	//tempOpspdiseinfo2.DiagCode = sickConfigTwo.ContentCode
761
-	//tempOpspdiseinfo2.DiagName = sickConfigTwo.CountryContentName
762
-	//tempOpspdiseinfo2.MaindiagFlag = "2"
763
-	//tempOpspdiseinfo2.OprnOprtCode = ""
764
-	//tempOpspdiseinfo2.OprnOprtName = ""
765
-	//tempOpspdiseinfos = append(tempOpspdiseinfos, tempOpspdiseinfo2)
759
+	sickConfigTwo, _ := service.FindSickById(his.SickType)
760
+	tempOpspdiseinfo2.DiagCode = sickConfigTwo.ContentCode
761
+	tempOpspdiseinfo2.DiagName = sickConfigTwo.CountryContentName
762
+	tempOpspdiseinfo2.MaindiagFlag = "2"
763
+	tempOpspdiseinfo2.OprnOprtCode = ""
764
+	tempOpspdiseinfo2.OprnOprtName = ""
765
+	tempOpspdiseinfos = append(tempOpspdiseinfos, tempOpspdiseinfo2)
766 766
 	struct4101.OpspdiseinfoStruct = tempOpspdiseinfos
767 767
 
768 768
 	var iteminfo service.IteminfoStruct