命名空间调整

AIMS/AIMS.csproj

@@ -225,161 +225,155 @@
     <Compile Include="OperationAfter\frmQualityControlViewParent.designer.cs">
       <DependentUpon>frmQualityControlViewParent.cs</DependentUpon>
     </Compile>
-    <Compile Include="OperationDoing\AnasRecordBill\frmAanesthesiaRecord.cs">
+    <Compile Include="OperationAanesthesia\frmAanesthesiaRecord.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="OperationDoing\AnasRecordBill\frmAanesthesiaRecord.Designer.cs">
+    <Compile Include="OperationAanesthesia\frmAanesthesiaRecord.Designer.cs">
       <DependentUpon>frmAanesthesiaRecord.cs</DependentUpon>
     </Compile>
-    <Compile Include="OperationDoing\AnasRecordBill\frmPhysioDataEdit.cs">
+    <Compile Include="OperationAanesthesia\frmPhysioDataEdit.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="OperationDoing\AnasRecordBill\frmPhysioDataEdit.designer.cs">
+    <Compile Include="OperationAanesthesia\frmPhysioDataEdit.designer.cs">
       <DependentUpon>frmPhysioDataEdit.cs</DependentUpon>
     </Compile>
-    <Compile Include="OperationDoing\AnasRecordBill\frmInstrumentRecord.cs">
+    <Compile Include="OperationAanesthesia\frmInstrumentRecord.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="OperationDoing\AnasRecordBill\frmInstrumentRecord.Designer.cs">
+    <Compile Include="OperationAanesthesia\frmInstrumentRecord.Designer.cs">
       <DependentUpon>frmInstrumentRecord.cs</DependentUpon>
     </Compile>
-    <Compile Include="OperationDoing\AnasRecordBill\frmOperationInfoNew2.cs">
+    <Compile Include="OperationAanesthesia\frmOperationInfoNew2.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="OperationDoing\AnasRecordBill\frmOperationInfoNew2.designer.cs">
+    <Compile Include="OperationAanesthesia\frmOperationInfoNew2.designer.cs">
       <DependentUpon>frmOperationInfoNew2.cs</DependentUpon>
     </Compile>
-    <Compile Include="OperationDoing\AnasRecordBill\frmSelectPatientNew2.cs">
+    <Compile Include="OperationAanesthesia\frmSelectPatientNew2.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="OperationDoing\AnasRecordBill\frmSelectPatientNew2.Designer.cs">
+    <Compile Include="OperationAanesthesia\frmSelectPatientNew2.Designer.cs">
       <DependentUpon>frmSelectPatientNew2.cs</DependentUpon>
     </Compile>
-    <Compile Include="OperationDoing\AnasRecordBill\frmSeleteRoom.cs">
+    <Compile Include="OperationAanesthesia\frmSeleteRoom.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="OperationDoing\AnasRecordBill\frmSeleteRoom.designer.cs">
+    <Compile Include="OperationAanesthesia\frmSeleteRoom.designer.cs">
       <DependentUpon>frmSeleteRoom.cs</DependentUpon>
     </Compile>
-    <Compile Include="OperationDoing\AnasRecordBill\frmBloodGasAnalysisNew.cs">
+    <Compile Include="OperationAanesthesia\frmBloodGasAnalysisNew.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="OperationDoing\AnasRecordBill\frmBloodGasAnalysisNew.Designer.cs">
+    <Compile Include="OperationAanesthesia\frmBloodGasAnalysisNew.Designer.cs">
       <DependentUpon>frmBloodGasAnalysisNew.cs</DependentUpon>
     </Compile>
-    <Compile Include="OperationDoing\AnasRecordBill\frmPhysiosSetting.cs">
+    <Compile Include="OperationAanesthesia\frmPhysiosSetting.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="OperationDoing\AnasRecordBill\frmPhysiosSetting.designer.cs">
+    <Compile Include="OperationAanesthesia\frmPhysiosSetting.designer.cs">
       <DependentUpon>frmPhysiosSetting.cs</DependentUpon>
     </Compile>
-    <Compile Include="OperationDoing\AnasRecordBill\frmOperationInfoNew.cs">
+    <Compile Include="OperationAanesthesia\frmOperationInfoNew.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="OperationDoing\AnasRecordBill\frmOperationInfoNew.designer.cs">
+    <Compile Include="OperationAanesthesia\frmOperationInfoNew.designer.cs">
       <DependentUpon>frmOperationInfoNew.cs</DependentUpon>
     </Compile>
-    <Compile Include="OperationDoing\AnasRecordBill\frmSafetyExamine.cs">
+    <Compile Include="OperationAanesthesia\frmSafetyExamine.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="OperationDoing\AnasRecordBill\frmSafetyExamine.Designer.cs">
+    <Compile Include="OperationAanesthesia\frmSafetyExamine.Designer.cs">
       <DependentUpon>frmSafetyExamine.cs</DependentUpon>
     </Compile>
-    <Compile Include="OperationDoing\AnasRecoverBill\frmAanesthesiaRecover.cs">
+    <Compile Include="OperationAanesthesia\frmAanesthesiaRecover.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="OperationDoing\AnasRecoverBill\frmAanesthesiaRecover.Designer.cs">
+    <Compile Include="OperationAanesthesia\frmAanesthesiaRecover.Designer.cs">
       <DependentUpon>frmAanesthesiaRecover.cs</DependentUpon>
     </Compile>
-    <Compile Include="OperationDoing\AnasRecoverBill\frmRecoverPatient.cs">
+    <Compile Include="OperationAanesthesia\frmRecoverPatient.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="OperationDoing\AnasRecoverBill\frmRecoverPatient.Designer.cs">
+    <Compile Include="OperationAanesthesia\frmRecoverPatient.Designer.cs">
       <DependentUpon>frmRecoverPatient.cs</DependentUpon>
     </Compile>
-    <Compile Include="OperationDoing\oldSystemCode\FormUseDrugsReport.cs">
+    <Compile Include="OperationAanesthesia\oldSystemCode\frmChargRecordPrint.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="OperationDoing\oldSystemCode\FormUseDrugsReport.designer.cs">
+    <Compile Include="OperationAanesthesia\oldSystemCode\frmChargRecordPrint.designer.cs">
-      <DependentUpon>FormUseDrugsReport.cs</DependentUpon>
-    </Compile>
-    <Compile Include="OperationDoing\oldSystemCode\frmChargRecordPrint.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="OperationDoing\oldSystemCode\frmChargRecordPrint.designer.cs">
       <DependentUpon>frmChargRecordPrint.cs</DependentUpon>
     </Compile>
-    <Compile Include="OperationDoing\oldSystemCode\frmHemodynamics.cs">
+    <Compile Include="OperationAanesthesia\oldSystemCode\frmHemodynamics.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="OperationDoing\oldSystemCode\frmHemodynamics.designer.cs">
+    <Compile Include="OperationAanesthesia\oldSystemCode\frmHemodynamics.designer.cs">
       <DependentUpon>frmHemodynamics.cs</DependentUpon>
     </Compile>
-    <Compile Include="OperationDoing\AnasRecoverBill\frmOpeRecoverInInfo.cs">
+    <Compile Include="OperationAanesthesia\frmOpeRecoverInInfo.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="OperationDoing\AnasRecoverBill\frmOpeRecoverInInfo.designer.cs">
+    <Compile Include="OperationAanesthesia\frmOpeRecoverInInfo.designer.cs">
       <DependentUpon>frmOpeRecoverInInfo.cs</DependentUpon>
     </Compile>
-    <Compile Include="OperationDoing\oldSystemCode\frmInstrumentRegistration.cs">
+    <Compile Include="OperationAanesthesia\oldSystemCode\frmInstrumentRegistration.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="OperationDoing\oldSystemCode\frmInstrumentRegistration.designer.cs">
+    <Compile Include="OperationAanesthesia\oldSystemCode\frmInstrumentRegistration.designer.cs">
       <DependentUpon>frmInstrumentRegistration.cs</DependentUpon>
     </Compile>
-    <Compile Include="OperationDoing\oldSystemCode\frmKnowledgeBase.cs">
+    <Compile Include="OperationAanesthesia\oldSystemCode\frmKnowledgeBase.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="OperationDoing\oldSystemCode\frmKnowledgeBase.designer.cs">
+    <Compile Include="OperationAanesthesia\oldSystemCode\frmKnowledgeBase.designer.cs">
       <DependentUpon>frmKnowledgeBase.cs</DependentUpon>
     </Compile>
-    <Compile Include="OperationDoing\oldSystemCode\frmLISResult.cs">
+    <Compile Include="OperationAanesthesia\oldSystemCode\frmLISResult.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="OperationDoing\oldSystemCode\frmLISResult.designer.cs">
+    <Compile Include="OperationAanesthesia\oldSystemCode\frmLISResult.designer.cs">
       <DependentUpon>frmLISResult.cs</DependentUpon>
     </Compile>
-    <Compile Include="OperationDoing\oldSystemCode\frmNoticeLargeScreen.cs">
+    <Compile Include="OperationAanesthesia\oldSystemCode\frmNoticeLargeScreen.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="OperationDoing\oldSystemCode\frmNoticeLargeScreen.designer.cs">
+    <Compile Include="OperationAanesthesia\oldSystemCode\frmNoticeLargeScreen.designer.cs">
       <DependentUpon>frmNoticeLargeScreen.cs</DependentUpon>
     </Compile>
-    <Compile Include="OperationDoing\oldSystemCode\frmOperatingRoomRegister.cs">
+    <Compile Include="OperationAanesthesia\oldSystemCode\frmOperatingRoomRegister.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="OperationDoing\oldSystemCode\frmOperatingRoomRegister.designer.cs">
+    <Compile Include="OperationAanesthesia\oldSystemCode\frmOperatingRoomRegister.designer.cs">
       <DependentUpon>frmOperatingRoomRegister.cs</DependentUpon>
     </Compile>
-    <Compile Include="OperationDoing\AnasRecoverBill\frmOpeRecoverOutInfo.cs">
+    <Compile Include="OperationAanesthesia\frmOpeRecoverOutInfo.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="OperationDoing\AnasRecoverBill\frmOpeRecoverOutInfo.designer.cs">
+    <Compile Include="OperationAanesthesia\frmOpeRecoverOutInfo.designer.cs">
       <DependentUpon>frmOpeRecoverOutInfo.cs</DependentUpon>
     </Compile>
-    <Compile Include="OperationDoing\oldSystemCode\frmPhysioDataUpdateLog.cs">
+    <Compile Include="OperationAanesthesia\oldSystemCode\frmPhysioDataUpdateLog.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="OperationDoing\oldSystemCode\frmPhysioDataUpdateLog.designer.cs">
+    <Compile Include="OperationAanesthesia\oldSystemCode\frmPhysioDataUpdateLog.designer.cs">
       <DependentUpon>frmPhysioDataUpdateLog.cs</DependentUpon>
     </Compile>
-    <Compile Include="OperationDoing\oldSystemCode\frmSelectApplianceUseType.cs">
+    <Compile Include="OperationAanesthesia\oldSystemCode\frmSelectApplianceUseType.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="OperationDoing\oldSystemCode\frmSelectApplianceUseType.designer.cs">
+    <Compile Include="OperationAanesthesia\oldSystemCode\frmSelectApplianceUseType.designer.cs">
       <DependentUpon>frmSelectApplianceUseType.cs</DependentUpon>
     </Compile>
-    <Compile Include="OperationDoing\oldSystemCode\frmSelectPatientGoodsBill.cs">
+    <Compile Include="OperationAanesthesia\oldSystemCode\frmSelectPatientGoodsBill.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="OperationDoing\oldSystemCode\frmSelectPatientGoodsBill.Designer.cs">
+    <Compile Include="OperationAanesthesia\oldSystemCode\frmSelectPatientGoodsBill.Designer.cs">
       <DependentUpon>frmSelectPatientGoodsBill.cs</DependentUpon>
     </Compile>
-    <Compile Include="OperationFront\FrmScheduling3.cs">
+    <Compile Include="OperationFront\frmPersonSchedulKeep.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="OperationFront\FrmScheduling3.designer.cs">
+    <Compile Include="OperationFront\frmPersonSchedulKeep.designer.cs">
-      <DependentUpon>FrmScheduling3.cs</DependentUpon>
+      <DependentUpon>frmPersonSchedulKeep.cs</DependentUpon>
     </Compile>
     <Compile Include="OremrUserControl\PanelScrollHelper.cs" />
     <Compile Include="OremrUserControl\PrescriptionDocument.cs">
@@ -388,24 +382,24 @@
     <Compile Include="OremrUserControl\PrescriptionDocument.Designer.cs">
       <DependentUpon>PrescriptionDocument.cs</DependentUpon>
     </Compile>
-    <Compile Include="OperationDoing\oldSystemCode\PublicToDoument.cs" />
+    <Compile Include="OperationAanesthesia\oldSystemCode\PublicToDoument.cs" />
     <Compile Include="OperationFront\frmPrintingArrangemen.cs">
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="OperationFront\frmPrintingArrangemen.designer.cs">
       <DependentUpon>frmPrintingArrangemen.cs</DependentUpon>
     </Compile>
-    <Compile Include="OperationFront\FrmScheduling2.cs">
+    <Compile Include="OperationFront\frmPersonSchedul.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="OperationFront\FrmScheduling2.designer.cs">
+    <Compile Include="OperationFront\frmPersonSchedul.designer.cs">
-      <DependentUpon>FrmScheduling2.cs</DependentUpon>
+      <DependentUpon>frmPersonSchedul.cs</DependentUpon>
     </Compile>
-    <Compile Include="OperationFront\FrmScheduling2Option.cs">
+    <Compile Include="OperationFront\frmPersonSchedulOption.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="OperationFront\FrmScheduling2Option.designer.cs">
+    <Compile Include="OperationFront\frmPersonSchedulOption.designer.cs">
-      <DependentUpon>FrmScheduling2Option.cs</DependentUpon>
+      <DependentUpon>frmPersonSchedulOption.cs</DependentUpon>
     </Compile>
     <Compile Include="OperationFront\frmSelectiveOperationsPrint.cs">
       <SubType>Form</SubType>
@@ -460,16 +454,16 @@
     <Compile Include="OremrUserControl\UCSurgicalNotice.designer.cs">
       <DependentUpon>UCSurgicalNotice.cs</DependentUpon>
     </Compile>
-    <Compile Include="OperationDoing\AnasRecordBill\frmAanesthesiaQuality.cs">
+    <Compile Include="OperationAanesthesia\frmAanesthesiaQuality.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="OperationDoing\AnasRecordBill\frmAanesthesiaQuality.designer.cs">
+    <Compile Include="OperationAanesthesia\frmAanesthesiaQuality.designer.cs">
       <DependentUpon>frmAanesthesiaQuality.cs</DependentUpon>
     </Compile>
-    <Compile Include="OperationDoing\AnasRecordBill\frmFactOutputLiquidsNew.cs">
+    <Compile Include="OperationAanesthesia\frmFactOutputLiquidsNew.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="OperationDoing\AnasRecordBill\frmFactOutputLiquidsNew.Designer.cs">
+    <Compile Include="OperationAanesthesia\frmFactOutputLiquidsNew.Designer.cs">
       <DependentUpon>frmFactOutputLiquidsNew.cs</DependentUpon>
     </Compile>
     <Compile Include="OremrUserControl\UText.cs">
@@ -541,7 +535,7 @@
     <Compile Include="OperationAfter\frmOperationReview.Designer.cs">
       <DependentUpon>frmOperationReview.cs</DependentUpon>
     </Compile>
-    <Compile Include="OperationDoing\AnasRecordBill\DrawAnasReordBill.cs" />
+    <Compile Include="OperationAanesthesia\DrawAnasReordBill.cs" />
     <Compile Include="OperationFront\frmExeOperationPlan.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -663,16 +657,16 @@
     <Compile Include="PublicUI\frmEditPassWord.Designer.cs">
       <DependentUpon>frmEditPassWord.cs</DependentUpon>
     </Compile>
-    <Compile Include="OperationDoing\AnasRecordBill\frmFactDrugNew.cs">
+    <Compile Include="OperationAanesthesia\frmFactDrugNew.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="OperationDoing\AnasRecordBill\frmFactDrugNew.Designer.cs">
+    <Compile Include="OperationAanesthesia\frmFactDrugNew.Designer.cs">
       <DependentUpon>frmFactDrugNew.cs</DependentUpon>
     </Compile>
-    <Compile Include="OperationDoing\AnasRecordBill\frmFactEventsNew.cs">
+    <Compile Include="OperationAanesthesia\frmFactEventsNew.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="OperationDoing\AnasRecordBill\frmFactEventsNew.Designer.cs">
+    <Compile Include="OperationAanesthesia\frmFactEventsNew.Designer.cs">
       <DependentUpon>frmFactEventsNew.cs</DependentUpon>
     </Compile>
     <Compile Include="DataDictionary\frmMenu.cs">
@@ -828,86 +822,83 @@
     <EmbeddedResource Include="OperationAfter\frmQualityControlViewParent.resx">
       <DependentUpon>frmQualityControlViewParent.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="OperationDoing\AnasRecordBill\frmAanesthesiaRecord.resx">
+    <EmbeddedResource Include="OperationAanesthesia\frmAanesthesiaRecord.resx">
       <DependentUpon>frmAanesthesiaRecord.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="OperationDoing\AnasRecordBill\frmPhysioDataEdit.resx">
+    <EmbeddedResource Include="OperationAanesthesia\frmPhysioDataEdit.resx">
       <DependentUpon>frmPhysioDataEdit.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="OperationDoing\AnasRecordBill\frmInstrumentRecord.resx">
+    <EmbeddedResource Include="OperationAanesthesia\frmInstrumentRecord.resx">
       <DependentUpon>frmInstrumentRecord.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="OperationDoing\AnasRecordBill\frmBloodGasAnalysisNew.resx">
+    <EmbeddedResource Include="OperationAanesthesia\frmBloodGasAnalysisNew.resx">
       <DependentUpon>frmBloodGasAnalysisNew.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="OperationDoing\AnasRecordBill\frmOperationInfoNew2.resx">
+    <EmbeddedResource Include="OperationAanesthesia\frmOperationInfoNew2.resx">
       <DependentUpon>frmOperationInfoNew2.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="OperationDoing\AnasRecordBill\frmSelectPatientNew2.resx">
+    <EmbeddedResource Include="OperationAanesthesia\frmSelectPatientNew2.resx">
       <DependentUpon>frmSelectPatientNew2.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="OperationDoing\AnasRecordBill\frmSeleteRoom.resx">
+    <EmbeddedResource Include="OperationAanesthesia\frmSeleteRoom.resx">
       <DependentUpon>frmSeleteRoom.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="OperationDoing\AnasRecordBill\frmPhysiosSetting.resx">
+    <EmbeddedResource Include="OperationAanesthesia\frmPhysiosSetting.resx">
       <DependentUpon>frmPhysiosSetting.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="OperationDoing\AnasRecordBill\frmOperationInfoNew.resx">
+    <EmbeddedResource Include="OperationAanesthesia\frmOperationInfoNew.resx">
       <DependentUpon>frmOperationInfoNew.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="OperationDoing\AnasRecordBill\frmSafetyExamine.resx">
+    <EmbeddedResource Include="OperationAanesthesia\frmSafetyExamine.resx">
       <DependentUpon>frmSafetyExamine.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="OperationDoing\AnasRecoverBill\frmAanesthesiaRecover.resx">
+    <EmbeddedResource Include="OperationAanesthesia\frmAanesthesiaRecover.resx">
       <DependentUpon>frmAanesthesiaRecover.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="OperationDoing\AnasRecoverBill\frmRecoverPatient.resx">
+    <EmbeddedResource Include="OperationAanesthesia\frmRecoverPatient.resx">
       <DependentUpon>frmRecoverPatient.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="OperationDoing\oldSystemCode\FormUseDrugsReport.resx">
+    <EmbeddedResource Include="OperationAanesthesia\oldSystemCode\frmChargRecordPrint.resx">
-      <DependentUpon>FormUseDrugsReport.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="OperationDoing\oldSystemCode\frmChargRecordPrint.resx">
       <DependentUpon>frmChargRecordPrint.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="OperationDoing\oldSystemCode\frmHemodynamics.resx">
+    <EmbeddedResource Include="OperationAanesthesia\oldSystemCode\frmHemodynamics.resx">
       <DependentUpon>frmHemodynamics.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="OperationDoing\AnasRecoverBill\frmOpeRecoverInInfo.resx">
+    <EmbeddedResource Include="OperationAanesthesia\frmOpeRecoverInInfo.resx">
       <DependentUpon>frmOpeRecoverInInfo.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="OperationDoing\oldSystemCode\frmInstrumentRegistration.resx">
+    <EmbeddedResource Include="OperationAanesthesia\oldSystemCode\frmInstrumentRegistration.resx">
       <DependentUpon>frmInstrumentRegistration.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="OperationDoing\oldSystemCode\frmKnowledgeBase.resx">
+    <EmbeddedResource Include="OperationAanesthesia\oldSystemCode\frmKnowledgeBase.resx">
       <DependentUpon>frmKnowledgeBase.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="OperationDoing\oldSystemCode\frmLISResult.resx">
+    <EmbeddedResource Include="OperationAanesthesia\oldSystemCode\frmLISResult.resx">
       <DependentUpon>frmLISResult.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="OperationDoing\oldSystemCode\frmNoticeLargeScreen.resx">
+    <EmbeddedResource Include="OperationAanesthesia\oldSystemCode\frmNoticeLargeScreen.resx">
       <DependentUpon>frmNoticeLargeScreen.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="OperationDoing\oldSystemCode\frmOperatingRoomRegister.resx">
+    <EmbeddedResource Include="OperationAanesthesia\oldSystemCode\frmOperatingRoomRegister.resx">
       <DependentUpon>frmOperatingRoomRegister.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="OperationDoing\AnasRecoverBill\frmOpeRecoverOutInfo.resx">
+    <EmbeddedResource Include="OperationAanesthesia\frmOpeRecoverOutInfo.resx">
       <DependentUpon>frmOpeRecoverOutInfo.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="OperationDoing\oldSystemCode\frmPhysioDataUpdateLog.resx">
+    <EmbeddedResource Include="OperationAanesthesia\oldSystemCode\frmPhysioDataUpdateLog.resx">
       <DependentUpon>frmPhysioDataUpdateLog.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="OperationDoing\oldSystemCode\frmSelectApplianceUseType.resx">
+    <EmbeddedResource Include="OperationAanesthesia\oldSystemCode\frmSelectApplianceUseType.resx">
       <DependentUpon>frmSelectApplianceUseType.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="OperationDoing\oldSystemCode\frmSelectPatientGoodsBill.resx">
+    <EmbeddedResource Include="OperationAanesthesia\oldSystemCode\frmSelectPatientGoodsBill.resx">
       <DependentUpon>frmSelectPatientGoodsBill.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="OperationFront\FrmScheduling3.resx">
+    <EmbeddedResource Include="OperationFront\frmPersonSchedulKeep.resx">
-      <DependentUpon>FrmScheduling3.cs</DependentUpon>
+      <DependentUpon>frmPersonSchedulKeep.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="OremrUserControl\PrescriptionDocument.resx">
       <DependentUpon>PrescriptionDocument.cs</DependentUpon>
@@ -915,11 +906,11 @@
     <EmbeddedResource Include="OperationFront\frmPrintingArrangemen.resx">
       <DependentUpon>frmPrintingArrangemen.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="OperationFront\FrmScheduling2.resx">
+    <EmbeddedResource Include="OperationFront\frmPersonSchedul.resx">
-      <DependentUpon>FrmScheduling2.cs</DependentUpon>
+      <DependentUpon>frmPersonSchedul.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="OperationFront\FrmScheduling2Option.resx">
+    <EmbeddedResource Include="OperationFront\frmPersonSchedulOption.resx">
-      <DependentUpon>FrmScheduling2Option.cs</DependentUpon>
+      <DependentUpon>frmPersonSchedulOption.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="OperationFront\frmSelectiveOperationsPrint.resx">
       <DependentUpon>frmSelectiveOperationsPrint.cs</DependentUpon>
@@ -942,10 +933,10 @@
     <EmbeddedResource Include="OremrUserControl\UCSurgicalNotice.resx">
       <DependentUpon>UCSurgicalNotice.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="OperationDoing\AnasRecordBill\frmAanesthesiaQuality.resx">
+    <EmbeddedResource Include="OperationAanesthesia\frmAanesthesiaQuality.resx">
       <DependentUpon>frmAanesthesiaQuality.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="OperationDoing\AnasRecordBill\frmFactOutputLiquidsNew.resx">
+    <EmbeddedResource Include="OperationAanesthesia\frmFactOutputLiquidsNew.resx">
       <DependentUpon>frmFactOutputLiquidsNew.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="DataDictionary\frmAnaesthesiaDrugSelect.resx">
@@ -1048,10 +1039,10 @@
     <EmbeddedResource Include="PublicUI\frmEditPassWord.resx">
       <DependentUpon>frmEditPassWord.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="OperationDoing\AnasRecordBill\frmFactDrugNew.resx">
+    <EmbeddedResource Include="OperationAanesthesia\frmFactDrugNew.resx">
       <DependentUpon>frmFactDrugNew.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="OperationDoing\AnasRecordBill\frmFactEventsNew.resx">
+    <EmbeddedResource Include="OperationAanesthesia\frmFactEventsNew.resx">
       <DependentUpon>frmFactEventsNew.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="DataDictionary\frmMenu.resx">

AIMS/AIMS.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <AtuoUpdate>
-  <ConnectionString>Data Source=tx.wulvshi.cn;Initial Catalog=AIMSDB_QHDSGRYY;User ID=sa;Password=Test2020;</ConnectionString>
+  <ConnectionString>Data Source=.;Initial Catalog=AIMSDB_QHDSGRYY;User ID=sa;Password=Test2020;</ConnectionString>
   <DataConnectionString>Data Source=.;Initial Catalog=AIMSDB_DATA;User ID=sa;Password=Test2020;</DataConnectionString>
   <HisConnectionStringOracel>Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.10.7)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=orcl2))));Persist Security Info=True;User ID=smview;Password=i39;</HisConnectionStringOracel>
 </AtuoUpdate>

AIMS/DocManager/frmTemplateD.cs

@@ -15,7 +15,7 @@ using DCSoft.Writer;
 using DCSoft.Writer.Dom;
 using System.Xml;
 
-namespace AIMS.DocumentManager
+namespace AIMS.DocManager
 {
     public partial class frmTemplateD : Form
     {

AIMS/DocManager/frmTemplateD.designer.cs

@@ -1,4 +1,4 @@
-namespace AIMS.DocumentManager
+namespace AIMS.DocManager
 {
     partial class frmTemplateD
     {

AIMS/FormMainManage.cs

@@ -1,6 +1,6 @@
 using AIMS.DocManager;
-using AIMS.OperationDoing.AnasRecordBill;
+using AIMS.OperationAanesthesia;
-using AIMS.OperationDoing.AnasRecordBill.UI;
+using AIMS.OperationAanesthesia;
 using AIMSBLL;
 using AIMSExtension;
 using AIMSModel;

AIMS/OperationAanesthesia/DrawAnasReordBill.cs

@@ -8,7 +8,7 @@ using System.Collections.Generic;
 using System.Data;
 using System.Windows.Forms;
 
-namespace AIMS.OperationDoing.AnasRecordBill
+namespace AIMS.OperationAanesthesia
 {
     public class DrawAnasReordBill
     {

AIMS/OperationAanesthesia/frmAanesthesiaRecord.Designer.cs

@@ -1,4 +1,4 @@
-namespace AIMS.OperationDoing.AnasRecordBill.UI
+namespace AIMS.OperationAanesthesia
 {
     partial class frmAanesthesiaRecord
     {
@@ -546,6 +546,7 @@
             this.btnyldj.TabIndex = 29;
             this.btnyldj.Text = "     余量登记";
             this.btnyldj.UseVisualStyleBackColor = false;
+            this.btnyldj.Visible = false;
             this.btnyldj.Click += new System.EventHandler(this.btnyldj_Click);
             // 
             // btnzsk
@@ -1964,13 +1965,13 @@
             this.flowLayoutPanel1.Size = new System.Drawing.Size(147, 71);
             this.flowLayoutPanel1.TabIndex = 0;
             // 
-            // frmAnasRecordBill2
+            // frmAanesthesiaRecord
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
             this.ClientSize = new System.Drawing.Size(1711, 941);
             this.Controls.Add(this.panel1);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-            this.Name = "frmAnasRecordBill2";
+            this.Name = "frmAanesthesiaRecord";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "麻醉记录单";
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;

AIMS/OperationAanesthesia/frmAanesthesiaRecord.cs

@@ -4,7 +4,6 @@ using AIMS.PublicUI.UI;
 using AIMSBLL;
 using AIMSExtension;
 using AIMSModel;
-using DCSoftDotfuscate;
 using DevComponents.Editors.DateTimeAdv;
 using DocumentManagement;
 using DrawGraph;
@@ -18,9 +17,8 @@ using System.Drawing;
 using System.Drawing.Printing;
 using System.Linq;
 using System.Windows.Forms;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement.TaskbarClock;
 
-namespace AIMS.OperationDoing.AnasRecordBill.UI
+namespace AIMS.OperationAanesthesia
 {
     public partial class frmAanesthesiaRecord : Form
     {
@@ -985,7 +983,7 @@ namespace AIMS.OperationDoing.AnasRecordBill.UI
         #region 左侧按钮
         private void btnSelectPatient_Click(object sender, EventArgs e)
         {
-            OperationDoing.AnasRecordBill.UI.frmSelectPatientNew2 frmSelectPatient = new UI.frmSelectPatientNew2();
+            OperationAanesthesia.frmSelectPatientNew2 frmSelectPatient = new frmSelectPatientNew2();
             frmSelectPatient.isMainOpen = true;
             frmSelectPatient.frmAnasRecord = this;
             frmSelectPatient.FormClosed += new FormClosedEventHandler(frmSelectPatient_FormClosed);
@@ -1110,7 +1108,7 @@ namespace AIMS.OperationDoing.AnasRecordBill.UI
         {
             if (PatientId != 0)
             {
-                AIMS.OperationDoing.AnasRecordBill.UI.frmOperationInfoNew2 frmOperationInfo = new frmOperationInfoNew2();
+                AIMS.OperationAanesthesia.frmOperationInfoNew2 frmOperationInfo = new frmOperationInfoNew2();
                 frmOperationInfo._record = _record;
                 //frmOperationInfo.FormClosed += new FormClosedEventHandler(plRefresh_Click);
                 frmOperationInfo.ShowDialog();
@@ -2197,9 +2195,9 @@ namespace AIMS.OperationDoing.AnasRecordBill.UI
         #region 右侧按钮
         private void btnyldj_Click(object sender, EventArgs e)
         {
-            FormUseDrugsReport formUseDrugsReport = new FormUseDrugsReport(1);
+            //FormUseDrugsReport formUseDrugsReport = new FormUseDrugsReport(1);
-            if (_record != null) formUseDrugsReport._record = _record;
+            //if (_record != null) formUseDrugsReport._record = _record;
-            formUseDrugsReport.Show();
+            //formUseDrugsReport.Show();
         }
 
         private void btnzsk_Click(object sender, EventArgs e)

AIMS/OperationAanesthesia/frmAanesthesiaRecover.Designer.cs

@@ -1,4 +1,4 @@
-namespace AIMS.OperationDoing.AnasRecoverBill.UI
+namespace AIMS.OperationAanesthesia
 {
     partial class frmAanesthesiaRecover
     {

AIMS/OperationAanesthesia/frmAanesthesiaRecover.cs

@@ -1,5 +1,5 @@
 using AIMS.DocManager;
-using AIMS.OperationDoing.AnasRecordBill;
+using AIMS.OperationAanesthesia;
 using AIMS.OperationFront.UI;
 using AIMS.PublicUI.UI;
 using AIMSBLL;
@@ -19,7 +19,7 @@ using System.Linq;
 using System.Reflection;
 using System.Windows.Forms;
 
-namespace AIMS.OperationDoing.AnasRecoverBill.UI
+namespace AIMS.OperationAanesthesia
 {
     public partial class frmAanesthesiaRecover : Form
     {
@@ -641,7 +641,7 @@ namespace AIMS.OperationDoing.AnasRecoverBill.UI
         #region 左侧按钮
         private void btnSelectPatient_Click(object sender, EventArgs e)
         {
-            OperationDoing.AnasRecordBill.UI.frmRecoverPatient frmSelectPatient = new AnasRecordBill.UI.frmRecoverPatient();
+            OperationAanesthesia.frmRecoverPatient frmSelectPatient = new OperationAanesthesia.frmRecoverPatient();
             //frmSelectPatient.isMainOpen = true;
             frmSelectPatient.FormClosed += new FormClosedEventHandler(frmSelectPatient_FormClosed);
             frmSelectPatient.ShowDialog();

AIMS/OperationAanesthesia/frmBloodGasAnalysisNew.Designer.cs

@@ -1,4 +1,4 @@
-namespace AIMS.OperationDoing.AnasRecordBill.UI
+namespace AIMS.OperationAanesthesia
 {
     partial class frmBloodGasAnalysisNew
     {

AIMS/OperationAanesthesia/frmBloodGasAnalysisNew.cs

@@ -11,7 +11,7 @@ using System.Linq;
 using System.Windows.Forms;
 using DataDictionary;
 
-namespace AIMS.OperationDoing.AnasRecordBill.UI
+namespace AIMS.OperationAanesthesia
 {
     public partial class frmBloodGasAnalysisNew : Form
     {

AIMS/OperationAanesthesia/frmInstrumentRecord.Designer.cs

@@ -1,4 +1,4 @@
-namespace AIMS.OperationDoing.AnasRecordBill.UI
+namespace AIMS.OperationAanesthesia
 {
     partial class frmInstrumentRecord
     {

AIMS/OperationAanesthesia/frmInstrumentRecord.cs

@@ -5,13 +5,9 @@ using AIMS.PublicUI.UI;
 using AIMSBLL;
 using AIMSExtension;
 using AIMSModel;
-using AxNsoOfficeLib;
-using DCSoftDotfuscate;
-using DevComponents.DotNetBar;
 using DevComponents.Editors.DateTimeAdv;
 using DocumentManagement;
 using DrawGraph;
-using KHD_OREMRInterface;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
@@ -20,13 +16,10 @@ using System.Data;
 using System.Diagnostics;
 using System.Drawing;
 using System.Drawing.Printing;
-using System.IO;
 using System.Linq;
-using System.Reflection;
-using System.Security.Cryptography;
 using System.Windows.Forms;
 
-namespace AIMS.OperationDoing.AnasRecordBill.UI
+namespace AIMS.OperationAanesthesia
 {
     public partial class frmInstrumentRecord : Form
     {
@@ -421,7 +414,7 @@ namespace AIMS.OperationDoing.AnasRecordBill.UI
         #region 左侧按钮
         private void btnSelectPatient_Click(object sender, EventArgs e)
         {
-            OperationDoing.AnasRecordBill.UI.frmSelectPatientGoodsBill frmSelectPatient = new UI.frmSelectPatientGoodsBill();
+            OperationAanesthesia.frmSelectPatientGoodsBill frmSelectPatient = new frmSelectPatientGoodsBill();
             frmSelectPatient.isMainOpen = true;
             frmSelectPatient.frmAnasRecord = this;
             frmSelectPatient.FormClosed += new FormClosedEventHandler(frmSelectPatient_FormClosed);
@@ -549,7 +542,7 @@ namespace AIMS.OperationDoing.AnasRecordBill.UI
         {
             if (PatientId != 0)
             {
-                AIMS.OperationDoing.AnasRecordBill.UI.frmOperationInfoNew2 frmOperationInfo = new frmOperationInfoNew2();
+                AIMS.OperationAanesthesia.frmOperationInfoNew2 frmOperationInfo = new frmOperationInfoNew2();
                 frmOperationInfo._record = _record;
                 //frmOperationInfo.FormClosed += new FormClosedEventHandler(plRefresh_Click);
                 frmOperationInfo.ShowDialog();

AIMS/OperationAanesthesia/frmOpeRecoverInInfo.cs

@@ -7,7 +7,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
 
-namespace AIMS.OperationDoing.AnasRecoverBill.UI
+namespace AIMS.OperationAanesthesia
 {
     public partial class frmOpeRecoverInInfo : Form
     {

AIMS/OperationAanesthesia/frmOpeRecoverInInfo.designer.cs

@@ -1,4 +1,4 @@
-namespace AIMS.OperationDoing.AnasRecoverBill.UI
+namespace AIMS.OperationAanesthesia
 {
     partial class frmOpeRecoverInInfo
     {

AIMS/OperationAanesthesia/frmOpeRecoverOutInfo.cs

@@ -4,7 +4,7 @@ using DrawGraph;
 using System;
 using System.Windows.Forms;
 
-namespace AIMS.OperationDoing.AnasRecoverBill.UI
+namespace AIMS.OperationAanesthesia
 {
     public partial class frmOpeRecoverOutInfo : Form
     {

AIMS/OperationAanesthesia/frmOpeRecoverOutInfo.designer.cs

@@ -1,4 +1,4 @@
-namespace AIMS.OperationDoing.AnasRecoverBill.UI
+namespace AIMS.OperationAanesthesia
 {
     partial class frmOpeRecoverOutInfo
     {

AIMS/OperationAanesthesia/frmOperationInfoNew.cs

@@ -9,7 +9,7 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Windows.Forms;
 
-namespace AIMS.OperationDoing.AnasRecordBill.UI
+namespace AIMS.OperationAanesthesia
 {
     public partial class frmOperationInfoNew : Form, IMessageFilter
     {

AIMS/OperationAanesthesia/frmOperationInfoNew.designer.cs

@@ -1,4 +1,4 @@
-namespace AIMS.OperationDoing.AnasRecordBill.UI
+namespace AIMS.OperationAanesthesia
 {
     partial class frmOperationInfoNew
     {

AIMS/OperationAanesthesia/frmOperationInfoNew2.cs

@@ -9,7 +9,7 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Windows.Forms;
 
-namespace AIMS.OperationDoing.AnasRecordBill.UI
+namespace AIMS.OperationAanesthesia
 {
     public partial class frmOperationInfoNew2 : Form, IMessageFilter
     {

AIMS/OperationAanesthesia/frmOperationInfoNew2.designer.cs

@@ -1,4 +1,4 @@
-namespace AIMS.OperationDoing.AnasRecordBill.UI
+namespace AIMS.OperationAanesthesia
 {
     partial class frmOperationInfoNew2
     {

AIMS/OperationAanesthesia/frmPhysioDataEdit.cs

@@ -9,7 +9,7 @@ using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
 
-namespace AIMS.OperationDoing.AnasRecordBill
+namespace AIMS.OperationAanesthesia
 {
     public partial class frmPhysioDataEdit : Form
     {

AIMS/OperationAanesthesia/frmPhysioDataEdit.designer.cs

@@ -1,4 +1,4 @@
-namespace AIMS.OperationDoing.AnasRecordBill
+namespace AIMS.OperationAanesthesia
 {
     partial class frmPhysioDataEdit
     {

AIMS/OperationAanesthesia/frmPhysiosSetting.cs

@@ -8,7 +8,7 @@ using System.Linq;
 using System.Text;
 using System.Windows.Forms;
 
-namespace AIMS.OperationDoing.AnasRecordBill
+namespace AIMS.OperationAanesthesia
 {
     public partial class frmPhysiosSetting : Form
     {

AIMS/OperationAanesthesia/frmPhysiosSetting.designer.cs

@@ -1,5 +1,5 @@
 
-namespace AIMS.OperationDoing.AnasRecordBill
+namespace AIMS.OperationAanesthesia
 {
     partial class frmPhysiosSetting
     {

AIMS/OperationAanesthesia/frmRecoverPatient.Designer.cs

@@ -1,4 +1,4 @@
-namespace AIMS.OperationDoing.AnasRecordBill.UI
+namespace AIMS.OperationAanesthesia
 {
     partial class frmRecoverPatient
     {

AIMS/OperationAanesthesia/frmRecoverPatient.cs

@@ -11,7 +11,7 @@ using System.Windows.Forms;
 using AIMSBLL;
 using AIMSModel;
 
-namespace AIMS.OperationDoing.AnasRecordBill.UI
+namespace AIMS.OperationAanesthesia
 {
     public partial class frmRecoverPatient : Form
     {
@@ -142,7 +142,7 @@ namespace AIMS.OperationDoing.AnasRecordBill.UI
                 {
                     if (supTabPatient.SelectedTab.Name == "待恢复" && dgv.SelectedRows.Count > 0)
                     {
-                        AIMS.OperationDoing.AnasRecoverBill.UI.frmAanesthesiaRecover frmAnasRecord = new AnasRecoverBill.UI.frmAanesthesiaRecover();
+                        AIMS.OperationAanesthesia.frmAanesthesiaRecover frmAnasRecord = new OperationAanesthesia.frmAanesthesiaRecover();
                         frmAnasRecord.PatientId = int.Parse(dgv.SelectedRows[0].Cells["PatientIdColumn"].Value.ToString());
                         frmAnasRecord.ApplyId = int.Parse(dgv.SelectedRows[0].Cells["ApplyIdColumn"].Value.ToString());
                         frmAnasRecord.RecoverId = RecoverId;
@@ -182,7 +182,7 @@ namespace AIMS.OperationDoing.AnasRecordBill.UI
                 }
                 else
                 {
-                    AIMS.OperationDoing.AnasRecoverBill.UI.frmAanesthesiaRecover frmAnasRecord = new AnasRecoverBill.UI.frmAanesthesiaRecover();
+                    AIMS.OperationAanesthesia.frmAanesthesiaRecover frmAnasRecord = new OperationAanesthesia.frmAanesthesiaRecover();
                     frmAnasRecord.PatientId = PatientId;
                     frmAnasRecord.ApplyId = applyId;
                     frmAnasRecord.NowRoom = AIMSBLL.BOperationRoom.SelectSingle(int.Parse(uc.Tag.ToString()));
@@ -202,7 +202,7 @@ namespace AIMS.OperationDoing.AnasRecordBill.UI
             int SelApplyId = int.Parse(dgv2.CurrentRow.Cells["ApplyIdColumn2"].Value.ToString());
             int SelPatientId = int.Parse(dgv2.CurrentRow.Cells["PatientIdColumn2"].Value.ToString());
 
-            AIMS.OperationDoing.AnasRecoverBill.UI.frmAanesthesiaRecover frmAnasRecord = new OperationDoing.AnasRecoverBill.UI.frmAanesthesiaRecover();
+            AIMS.OperationAanesthesia.frmAanesthesiaRecover frmAnasRecord = new OperationAanesthesia.frmAanesthesiaRecover();
             frmAnasRecord.PatientId = SelPatientId;
             frmAnasRecord.ApplyId = SelApplyId;
             frmAnasRecord.State = AIMSExtension.EditState.BROWSE;

AIMS/OperationAanesthesia/frmSafetyExamine.Designer.cs

@@ -1,5 +1,5 @@
 
-namespace AIMS.OperationDoing.AnasRecordBill.UI
+namespace AIMS.OperationAanesthesia
 {
     partial class frmSafetyExamine
     {

AIMS/OperationAanesthesia/frmSafetyExamine.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Windows.Forms;
 
-namespace AIMS.OperationDoing.AnasRecordBill.UI
+namespace AIMS.OperationAanesthesia
 {
     public partial class frmSafetyExamine : Form
     {

AIMS/OperationAanesthesia/frmSelectPatientNew2.Designer.cs

@@ -1,4 +1,4 @@
-namespace AIMS.OperationDoing.AnasRecordBill.UI
+namespace AIMS.OperationAanesthesia
 {
     partial class frmSelectPatientNew2
     {

AIMS/OperationAanesthesia/frmSelectPatientNew2.cs

@@ -14,7 +14,7 @@ using DCSoftDotfuscate;
 using System.Net;
 using AIMSExtension;
 
-namespace AIMS.OperationDoing.AnasRecordBill.UI
+namespace AIMS.OperationAanesthesia
 {
     public partial class frmSelectPatientNew2 : Form
     {
@@ -22,7 +22,7 @@ namespace AIMS.OperationDoing.AnasRecordBill.UI
         public int SelPatientId;
         public int SelApplyId;
         public bool isMainOpen = false;
-        public AIMS.OperationDoing.AnasRecordBill.UI.frmAanesthesiaRecord frmAnasRecord;
+        public AIMS.OperationAanesthesia.frmAanesthesiaRecord frmAnasRecord;
         List<OperationRoom> rooms;
 
         public frmSelectPatientNew2()

AIMS/OperationAanesthesia/frmSeleteRoom.cs

@@ -10,7 +10,7 @@ using System.Linq;
 using System.Text;
 using System.Windows.Forms;
 
-namespace AIMS.OperationDoing.AnasRecordBill.UI
+namespace AIMS.OperationAanesthesia
 {
     public partial class frmSeleteRoom : Form
     {

AIMS/OperationAanesthesia/frmSeleteRoom.designer.cs

@@ -1,5 +1,5 @@
 
-namespace AIMS.OperationDoing.AnasRecordBill.UI
+namespace AIMS.OperationAanesthesia
 {
     partial class frmSeleteRoom
     {

AIMS/OperationAanesthesia/oldSystemCode/PublicToDoument.cs

@@ -9,7 +9,7 @@ using System.Drawing.Imaging;
 using System.IO;
 using System.Windows.Forms;
 
-namespace AIMS.OperationDoing.AnasRecordBill
+namespace AIMS.OperationAanesthesia
 {
     public static class PublicToDoument
     {

AIMS/OperationAanesthesia/oldSystemCode/frmChargRecordPrint.cs

@@ -4,7 +4,7 @@ using System;
 using System.Drawing;
 using System.Windows.Forms;
 
-namespace AIMS.OperationDoing.AnasRecordBill
+namespace AIMS.OperationAanesthesia
 {
     public partial class frmChargRecordPrint : Form
     {

AIMS/OperationAanesthesia/oldSystemCode/frmChargRecordPrint.designer.cs

@@ -1,5 +1,5 @@
 using System.Windows.Forms;
-namespace AIMS.OperationDoing.AnasRecordBill
+namespace AIMS.OperationAanesthesia
 {
     partial class frmChargRecordPrint
     {

AIMS/OperationAanesthesia/oldSystemCode/frmHemodynamics.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Windows.Forms;
 
-namespace AIMS.OperationDoing.AnasRecordBill
+namespace AIMS.OperationAanesthesia
 {
     public partial class frmHemodynamics : Form
     {

AIMS/OperationAanesthesia/oldSystemCode/frmHemodynamics.designer.cs

@@ -1,4 +1,4 @@
-namespace AIMS.OperationDoing.AnasRecordBill
+namespace AIMS.OperationAanesthesia
 {
     partial class frmHemodynamics
     {

AIMS/OperationAanesthesia/oldSystemCode/frmInstrumentRegistration.cs

@@ -7,7 +7,7 @@ using System.Data;
 using System.Linq;
 using System.Windows.Forms;
 
-namespace AIMS.OperationDoing.AnasRecordBill
+namespace AIMS.OperationAanesthesia
 {
     public partial class frmInstrumentRegistration : Form
     {

AIMS/OperationAanesthesia/oldSystemCode/frmInstrumentRegistration.designer.cs

@@ -1,4 +1,4 @@
-namespace AIMS.OperationDoing.AnasRecordBill
+namespace AIMS.OperationAanesthesia
 {
     partial class frmInstrumentRegistration
     {

AIMS/OperationAanesthesia/oldSystemCode/frmKnowledgeBase.cs

@@ -6,7 +6,7 @@ using System.Data;
 using System.Drawing;
 using System.Windows.Forms;
 
-namespace AIMS.OperationDoing.AnasRecordBill
+namespace AIMS.OperationAanesthesia
 {
     public partial class frmKnowledgeBase : Form
     {

AIMS/OperationAanesthesia/oldSystemCode/frmKnowledgeBase.designer.cs

@@ -1,4 +1,4 @@
-namespace AIMS.OperationDoing.AnasRecordBill
+namespace AIMS.OperationAanesthesia
 {
     partial class frmKnowledgeBase
     {

AIMS/OperationAanesthesia/oldSystemCode/frmLISResult.cs

@@ -4,7 +4,7 @@ using System.Data;
 using System.Windows.Forms;
 using System.Xml;
 
-namespace KHD_OREMRInterface
+namespace AIMS.OperationAanesthesia
 {
     public partial class frmLISResult : Form
     {

AIMS/OperationAanesthesia/oldSystemCode/frmLISResult.designer.cs

@@ -1,4 +1,4 @@
-namespace KHD_OREMRInterface
+namespace AIMS.OperationAanesthesia
 {
     partial class frmLISResult
     {

AIMS/OperationAanesthesia/oldSystemCode/frmNoticeLargeScreen.cs

@@ -10,7 +10,7 @@ using System.Drawing;
 using System.IO;
 using System.Windows.Forms;
 
-namespace AIMS.OperationDoing.AnasRecordBill
+namespace AIMS.OperationAanesthesia
 {
     public partial class frmNoticeLargeScreen : Form
     {

AIMS/OperationAanesthesia/oldSystemCode/frmNoticeLargeScreen.designer.cs

@@ -1,4 +1,4 @@
-namespace AIMS.OperationDoing.AnasRecordBill
+namespace AIMS.OperationAanesthesia
 {
     partial class frmNoticeLargeScreen
     {

AIMS/OperationAanesthesia/oldSystemCode/frmOperatingRoomRegister.cs

@@ -8,7 +8,7 @@ using System.Linq;
 using System.Text;
 using System.Windows.Forms;
 
-namespace AIMS.OperationDoing.AnasRecordBill
+namespace AIMS.OperationAanesthesia
 {
     public partial class frmOperatingRoomRegister : Form
     {

AIMS/OperationAanesthesia/oldSystemCode/frmOperatingRoomRegister.designer.cs

@@ -1,4 +1,4 @@
-namespace AIMS.OperationDoing.AnasRecordBill
+namespace AIMS.OperationAanesthesia
 {
     partial class frmOperatingRoomRegister
     {

AIMS/OperationAanesthesia/oldSystemCode/frmPhysioDataUpdateLog.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Windows.Forms;
 
-namespace AIMS.OperationDoing.AnasRecordBill
+namespace AIMS.OperationAanesthesia
 {
     public partial class frmPhysioDataUpdateLog : Form
     {

AIMS/OperationAanesthesia/oldSystemCode/frmPhysioDataUpdateLog.designer.cs

@@ -1,4 +1,4 @@
-namespace AIMS.OperationDoing.AnasRecordBill
+namespace AIMS.OperationAanesthesia
 {
     partial class frmPhysioDataUpdateLog
     {

AIMS/OperationAanesthesia/oldSystemCode/frmSelectApplianceUseType.cs

@@ -7,7 +7,7 @@ using System.Data;
 using System.Linq;
 using System.Windows.Forms;
 
-namespace AIMS.OperationDoing.AnasRecordBill
+namespace AIMS.OperationAanesthesia
 {
     public partial class frmSelectApplianceUseType : Form
     {

AIMS/OperationAanesthesia/oldSystemCode/frmSelectApplianceUseType.designer.cs

@@ -1,4 +1,4 @@
-namespace AIMS.OperationDoing.AnasRecordBill
+namespace AIMS.OperationAanesthesia
 {
     partial class frmSelectApplianceUseType
     {

AIMS/OperationAanesthesia/oldSystemCode/frmSelectPatientGoodsBill.Designer.cs

@@ -1,4 +1,4 @@
-namespace AIMS.OperationDoing.AnasRecordBill.UI
+namespace AIMS.OperationAanesthesia
 {
     partial class frmSelectPatientGoodsBill
     {

AIMS/OperationAanesthesia/oldSystemCode/frmSelectPatientGoodsBill.cs

@@ -11,7 +11,7 @@ using System.Drawing;
 using System.Net;
 using System.Windows.Forms;
 
-namespace AIMS.OperationDoing.AnasRecordBill.UI
+namespace AIMS.OperationAanesthesia
 {
     public partial class frmSelectPatientGoodsBill : Form
     {
@@ -19,7 +19,7 @@ namespace AIMS.OperationDoing.AnasRecordBill.UI
         public int SelPatientId;
         public int SelApplyId;
         public bool isMainOpen = false;
-        public AIMS.OperationDoing.AnasRecordBill.UI.frmInstrumentRecord frmAnasRecord;
+        public AIMS.OperationAanesthesia.frmInstrumentRecord frmAnasRecord;
         List<OperationRoom> rooms;
 
         public frmSelectPatientGoodsBill()

AIMS/OperationAfter/frmOperationReview.cs

@@ -60,7 +60,7 @@ namespace AIMS.OperationAfter.UI
                 int PatientId = int.Parse(dgv.CurrentRow.Cells["PatientId"].Value.ToString());
                 int ApplyId = int.Parse(dgv.CurrentRow.Cells["ApplyId"].Value.ToString());
 
-                AIMS.OperationDoing.AnasRecordBill.UI.frmAanesthesiaRecord frmAnasRecord = new AIMS.OperationDoing.AnasRecordBill.UI.frmAanesthesiaRecord();
+                AIMS.OperationAanesthesia.frmAanesthesiaRecord frmAnasRecord = new AIMS.OperationAanesthesia.frmAanesthesiaRecord();
                 frmAnasRecord.PatientId = PatientId;
                 frmAnasRecord.ApplyId = ApplyId;
                 frmAnasRecord.State = AIMSExtension.EditState.BROWSE;
@@ -80,7 +80,7 @@ namespace AIMS.OperationAfter.UI
                 int PatientId = int.Parse(dgv.CurrentRow.Cells["PatientId"].Value.ToString());
                 int ApplyId = int.Parse(dgv.CurrentRow.Cells["ApplyId"].Value.ToString());
 
-                AIMS.OperationDoing.AnasRecoverBill.UI.frmAanesthesiaRecover frmAnasRecord = new OperationDoing.AnasRecoverBill.UI.frmAanesthesiaRecover();
+                AIMS.OperationAanesthesia.frmAanesthesiaRecover frmAnasRecord = new OperationAanesthesia.frmAanesthesiaRecover();
                 frmAnasRecord.PatientId = PatientId;
                 frmAnasRecord.ApplyId = ApplyId;
                 frmAnasRecord.State = AIMSExtension.EditState.BROWSE;

AIMS/OperationDoing/oldSystemCode/FormUseDrugsReport.cs

@@ -1,882 +0,0 @@
-using AIMS.OremrUserControl;
-using AIMSBLL;
-using AIMSExtension;
-using AIMSModel;
-using DrawGraph;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Drawing;
-using System.Windows.Forms;
-
-namespace AIMS.OperationDoing.AnasRecordBill
-{
-    public partial class FormUseDrugsReport : Form
-    {
-        public int stuts;
-        public OperationRecord _record;
-        IList<UseDrugsReport> lists;
-        public FormUseDrugsReport()
-        {
-            InitializeComponent();
-            dgvUseDrugs.AutoGenerateColumns = false;
-            //SetMaxForm();
-        }
-        public FormUseDrugsReport(int s)
-        {
-            InitializeComponent();
-            dgvUseDrugs.AutoGenerateColumns = false;
-            //SetMaxForm();
-            this.stuts = s;
-            
-        }
-        private void SetMaxForm()
-        {
-            this.WindowState = FormWindowState.Normal;
-            this.FormBorderStyle = FormBorderStyle.Sizable;
-            this.Top = 0;
-            this.Left = 0;
-            this.Width = Screen.PrimaryScreen.WorkingArea.Width;
-            this.Height = Screen.PrimaryScreen.WorkingArea.Height;
-        }
-        private void FormUseDrugsReport_Load(object sender, EventArgs e)
-        {
-            if (_record != null)
-            {
-                labDate.Visible = false;
-                label24.Visible = false;
-                btnQuery.Visible = false;
-                dtpBegin.Visible = false;
-                dtpEnd.Visible = false;
-            }
-            else
-            {
-                buttonX1.Visible = false;
-                btndel.Visible = false;
-                btnSave.Visible = false;
-            }
-            if (this.stuts == 1)
-            {
-                pnlDoctor.Visible = true;
-                pnlNurse.Visible = false;
-                dgvUseDrugs.Columns["Enter"].Visible = false;
-            }
-            else
-            {
-                pnlDoctor.Visible = false;
-                pnlNurse.Visible = true;
-                dgvUseDrugs.Columns["Enter"].Visible = true;
-                btnNotRegister.Visible = true;
-            }
-            
-            lists = new List<UseDrugsReport>();
-            LoadDate();
-        }
-
-        private void toolStripButton7_Click(object sender, EventArgs e)
-        {
-            Close();
-        }
-
-        private void btnOK_Click_1(object sender, EventArgs e)
-        {
-            LoadDate();
-        }
-        private void LoadDate()
-        {
-            DateTime dtBegin = reBeginTime(dtpBegin.Value, "begin");
-            DateTime dtEnd = reBeginTime(dtpEnd.Value, "end");
-
-            if (_record != null)
-            {
-                dtBegin = reBeginTime(_record.InRoomTime.Value, "begin");
-                if (_record.OutRoomTime!=null)
-                    dtEnd = reBeginTime(_record.OutRoomTime.Value, "end");
-                else
-                    dtEnd = reBeginTime(DateTime.Now, "end");
-                lists = BUseDrugsReportManager.GetListByDateTimeWork(dtBegin.ToString(), dtEnd.ToString(), _record.Id.Value);
-            }
-            else
-            {
-                lists = BUseDrugsReportManager.GetListByDateTime(dtBegin.ToString(), dtEnd.ToString());
-            }
-            //dgvUseDrugs.DataSource = lists;
-            dgvUseDrugs.Rows.Clear();
-            foreach(UseDrugsReport udr in lists)
-            {
-                int index = dgvUseDrugs.Rows.Add();
-                dgvUseDrugs.Rows[index].Cells["Id"].Value = udr.Id;
-                dgvUseDrugs.Rows[index].Cells["用药Id"].Value = udr.用药Id;
-                dgvUseDrugs.Rows[index].Cells["加药时间"].Value = udr.加药时间.Value.ToString("HH:mm");
-                dgvUseDrugs.Rows[index].Cells["使用日期"].Value = udr.使用日期;
-                dgvUseDrugs.Rows[index].Cells["术间"].Value = udr.术间;
-                dgvUseDrugs.Rows[index].Cells["患者姓名"].Value = udr.患者姓名;
-                dgvUseDrugs.Rows[index].Cells["性别"].Value = udr.性别;
-                dgvUseDrugs.Rows[index].Cells["年龄"].Value = udr.年龄;
-                dgvUseDrugs.Rows[index].Cells["住院号"].Value = udr.住院号;
-                dgvUseDrugs.Rows[index].Cells["病历号"].Value = udr.病历号;
-                dgvUseDrugs.Rows[index].Cells["身份证号码"].Value = udr.身份证号码;
-                dgvUseDrugs.Rows[index].Cells["疾病名称"].Value = udr.疾病名称;
-                dgvUseDrugs.Rows[index].Cells["药品名称"].Value = udr.药品名称;
-                dgvUseDrugs.Rows[index].Cells["批号"].Value =udr.批号;
-                dgvUseDrugs.Rows[index].Cells["处方剂量"].Value = udr.处方剂量;
-                try
-                {
-                    dgvUseDrugs.Rows[index].Cells["用量"].Value = decimal.Parse(udr.用量).ToString("0.###");
-                }
-                catch (Exception)
-                {
-                    dgvUseDrugs.Rows[index].Cells["用量"].Value = udr.用量;
-                }
-                dgvUseDrugs.Rows[index].Cells["处方医师"].Value = udr.处方医师;
-                dgvUseDrugs.Rows[index].Cells["残留剂量"].Value = udr.残留剂量;
-                dgvUseDrugs.Rows[index].Cells["残液处理方式"].Value = udr.残液处理方式;
-                dgvUseDrugs.Rows[index].Cells["残液处理地点"].Value = udr.残液处理地点;
-                dgvUseDrugs.Rows[index].Cells["镇痛泵使用量"].Value = udr.镇痛泵使用量;
-                dgvUseDrugs.Rows[index].Cells["镇痛泵余量"].Value = udr.镇痛泵余量;
-                dgvUseDrugs.Rows[index].Cells["执行护士"].Value = udr.执行护士;
-                dgvUseDrugs.Rows[index].Cells["复核人"].Value = udr.复核人;
-                dgvUseDrugs.Rows[index].Cells["核对护士"].Value = udr.核对护士;
-                dgvUseDrugs.Rows[index].Cells["医生2"].Value = udr.医生签名2;
-                dgvUseDrugs.Rows[index].Cells["医生签名"].Value = udr.医生签名Img;
-                dgvUseDrugs.Rows[index].Cells["护士签名"].Value = udr.护士签名Img;
-                dgvUseDrugs.Rows[index].Cells["OperationRecordId"].Value = udr.Id;
-                dgvUseDrugs.Rows[index].Cells["State"].Value = udr.State;
-                dgvUseDrugs.Rows[index].Cells["数量"].Value = udr.Num;
-                dgvUseDrugs.Rows[index].Cells["单位"].Value = udr.SpecUnit;
-                dgvUseDrugs.Rows[index].Cells["Enter"].Value = udr.Enter == 1 ? true : false;
-                dgvUseDrugs.Rows[index].Tag = udr;
-            }
-            dgvUseDrugs.Columns[0].Visible = false;
-        }
-
-        private void toolStripButton2_Click(object sender, EventArgs e)
-        {
-            DateTime dtBegin = reBeginTime(_record.InRoomTime.Value, "begin");
-            DateTime dtEnd;
-            if(_record.OutRoomTime!=null)
-                dtEnd = reBeginTime(_record.OutRoomTime.Value, "end");
-            else
-                dtEnd = reBeginTime(DateTime.Now, "end");
-             
-            DataTable dt = null;
-            if (_record != null)
-            {
-                dt = BUseDrugsReportManager.GetUseDrugsReport(_record.Id.ToString());
-            }
-            else
-            {
-                dt = BUseDrugsReportManager.GetUseDrugsReport(dtBegin.ToString(), dtEnd.ToString());
-            }
-            //dgvUseDrugs.Rows.Clear();
-            foreach(DataRow row in dt.Rows)
-            {
-                bool flag = false;
-                int currentindex = 0;
-                foreach (DataGridViewRow r in dgvUseDrugs.Rows)
-                {
-                    if(row["用药Id"].ToString() == r.Cells["用药Id"].EditedFormattedValue.ToString())
-                    {
-                        flag = true;
-                        currentindex = r.Index;
-                        break;
-                    }
-                }
-                if(flag)
-                {
-                    dgvUseDrugs.Rows[currentindex].Cells["State"].Value = 0;
-                    if (row["处方剂量"].ToString().Length > 1 && row["用量"].ToString().Length > 1)
-                    {
-                        string useUnit = row["用量单位"].ToString().ToString();
-                        string drugeUnit = row["单位"].ToString().Trim();
-                        if (useUnit == drugeUnit)
-                        {
-                            decimal jl = decimal.Parse(row["处方剂量"].ToString());
-                            decimal yl = decimal.Parse(row["用量"].ToString());
-                            int num = yl % jl == 0 ? (int)(yl / jl) : (int)((yl / jl) + 1);
-                            decimal cyl = num * jl - yl;
-                            dgvUseDrugs.Rows[currentindex].Cells["数量"].Value = num;
-                            dgvUseDrugs.Rows[currentindex].Cells["用量"].Value = decimal.Parse(row["用量"].ToString()).ToString("0.###");
-                            dgvUseDrugs.Rows[currentindex].Cells["残留剂量"].Value = cyl.ToString("0.###");
-                            if (yl % jl == 0)
-                            {
-                                dgvUseDrugs.Rows[currentindex].Cells["残液处理方式"].Value = "无";
-                            }
-                            else
-                            {
-                                dgvUseDrugs.Rows[currentindex].Cells["残液处理方式"].Value = "废弃";
-                            }
-                        }
-                    }
-                }
-                else
-                {
-                    int index = dgvUseDrugs.Rows.Add();
-                    dgvUseDrugs.Rows[index].Cells["用药Id"].Value = row["用药Id"].ToString();
-                    dgvUseDrugs.Rows[index].Cells["加药时间"].Value = DateTime.Parse(row["加药时间"].ToString()).ToString("HH:mm");
-                    dgvUseDrugs.Rows[index].Cells["使用日期"].Value = DateTime.Parse(row["使用日期"].ToString()).ToShortDateString();
-                    dgvUseDrugs.Rows[index].Cells["术间"].Value = row["术间"].ToString();
-                    dgvUseDrugs.Rows[index].Cells["患者姓名"].Value = row["患者姓名"].ToString();
-                    dgvUseDrugs.Rows[index].Cells["性别"].Value = row["性别"].ToString();
-                    dgvUseDrugs.Rows[index].Cells["年龄"].Value = row["年龄"].ToString();
-                    dgvUseDrugs.Rows[index].Cells["住院号"].Value = row["住院号"].ToString();
-                    dgvUseDrugs.Rows[index].Cells["病历号"].Value = row["病历号"].ToString();
-                    dgvUseDrugs.Rows[index].Cells["身份证号码"].Value = row["身份证号码"].ToString();
-                    dgvUseDrugs.Rows[index].Cells["疾病名称"].Value = row["疾病名称"].ToString();
-                    dgvUseDrugs.Rows[index].Cells["药品名称"].Value = row["药品名称"].ToString();
-                    dgvUseDrugs.Rows[index].Cells["批号"].Value = row["批号"].ToString();
-                    dgvUseDrugs.Rows[index].Cells["处方剂量"].Value = row["处方剂量"].ToString() + row["单位"].ToString().Trim();
-                    
-                    dgvUseDrugs.Rows[index].Cells["处方医师"].Value = row["处方医师"].ToString();
-                    dgvUseDrugs.Rows[index].Cells["残液处理方式"].Value = row["残液处理方式"].ToString();
-                    dgvUseDrugs.Rows[index].Cells["残液处理地点"].Value = row["残液处理地点"].ToString();
-                    dgvUseDrugs.Rows[index].Cells["执行护士"].Value = row["执行护士"].ToString();
-                    dgvUseDrugs.Rows[index].Cells["复核人"].Value = row["复核人"].ToString();
-                    dgvUseDrugs.Rows[index].Cells["核对护士"].Value = row["核对护士"].ToString();
-                    dgvUseDrugs.Rows[index].Cells["医生2"].Value = row["医生2"].ToString();
-                    dgvUseDrugs.Rows[index].Cells["OperationRecordId"].Value = row["Id"].ToString();
-                    dgvUseDrugs.Rows[index].Cells["State"].Value = 0;
-                    dgvUseDrugs.Rows[index].Cells["单位"].Value = row["包装单位"].ToString();
-                    if (row["处方剂量"].ToString().Length > 1 && row["用量"].ToString().Length > 1)
-                    {
-                        string useUnit = row["用量单位"].ToString().ToString();
-                        string drugeUnit = row["单位"].ToString().Trim();
-                        if (useUnit == drugeUnit)
-                        {
-                            decimal jl = decimal.Parse(row["处方剂量"].ToString());
-                            decimal yl = decimal.Parse(row["用量"].ToString());
-                            int num = yl % jl == 0 ? (int)(yl / jl) : (int)((yl / jl) + 1);
-                            decimal cyl = num * jl - yl;
-                            dgvUseDrugs.Rows[index].Cells["数量"].Value = num;
-                            dgvUseDrugs.Rows[index].Cells["用量"].Value = decimal.Parse(row["用量"].ToString()).ToString("0.###");
-                            dgvUseDrugs.Rows[index].Cells["残留剂量"].Value = cyl.ToString("0.###");
-                            if (yl % jl == 0)
-                            {
-                                dgvUseDrugs.Rows[index].Cells["残液处理方式"].Value = "无";
-                            }
-                        }
-                    }
-                }
-            }
-            //if (_record != null)
-            //{
-            //    dtBegin = reBeginTime(_record.InRoomTime.Value, "begin");
-            //    dtEnd = reBeginTime(_record.InRoomTime.Value, "end");
-            //    lists = BUseDrugsReportManager.GetListByDateTimeWork(dtBegin.ToString(), dtEnd.ToString(), _record.PatientRef.InHospitalNo);
-            //}
-            //else
-            //{
-            //    lists = BUseDrugsReportManager.GetListByDateTime(dtBegin.ToString(), dtEnd.ToString());
-            //}
-
-            //foreach (DataRow item in dt.Rows)
-            //{
-            //    UseDrugsReport temp = new UseDrugsReport();
-            //    temp.加药时间 = DateTime.Parse(item["加药时间"].ToString());
-            //    temp.用药Id = int.Parse(item["用药Id"].ToString());
-            //    temp.患者姓名 = item["患者姓名"].ToString();
-            //    temp.使用日期 = item["使用日期"].ToString();
-            //    temp.性别 = item["性别"].ToString();
-            //    temp.年龄 = item["年龄"].ToString();
-            //    temp.住院号 = item["住院号"].ToString();
-            //    temp.病历号 = item["病历号"].ToString();
-            //    temp.身份证号码 = item["身份证号码"].ToString();
-            //    temp.疾病名称 = item["疾病名称"].ToString();
-            //    temp.药品名称 = item["药品名称"].ToString();
-            //    temp.批号 = item["批号"].ToString();
-            //    temp.处方剂量 = item["处方剂量"].ToString();
-            //    temp.用量 = item["用量"].ToString();
-            //    temp.术间 = item["术间"].ToString();
-            //    temp.处方医师 = item["处方医师"].ToString();
-            //    temp.残留剂量 = item["残留剂量"].ToString();
-            //    temp.残液处理方式 = item["残液处理方式"].ToString();
-            //    temp.残液处理地点 = item["残液处理地点"].ToString();
-            //    temp.执行护士 = item["执行护士"].ToString();
-            //    temp.复核人 = item["复核人"].ToString();
-            //    temp.核对护士 = item["核对护士"].ToString();
-            //    insertOrupdate(temp);
-            //}
-
-            //List<UseDrugsReport> dellist = new List<UseDrugsReport>();
-            //foreach (var item1 in lists)
-            //{
-            //    bool istrue = false;
-            //    foreach (DataRow item in dt.Rows)
-            //    {
-            //        UseDrugsReport temp = new UseDrugsReport();
-            //        temp.加药时间 = DateTime.Parse(item["加药时间"].ToString());
-            //        temp.用药Id = int.Parse(item["用药Id"].ToString());
-            //        temp.患者姓名 = item["患者姓名"].ToString();
-            //        temp.使用日期 = item["使用日期"].ToString();
-            //        temp.住院号 = item["住院号"].ToString();
-            //        temp.药品名称 = item["药品名称"].ToString();
-            //        if (temp.加药时间 == item1.加药时间 &&
-            //         temp.用药Id == item1.用药Id &&
-            //         temp.使用日期 == item1.使用日期 &&
-            //         temp.住院号 == item1.住院号 &&
-            //         temp.药品名称 == item1.药品名称)
-            //        {
-            //            istrue = true;
-            //        }
-            //    }
-            //    if (istrue == false)
-            //        dellist.Add(item1);//UseDrugsReportManager.DelUseDrugsReport(item);
-            //}
-            //for (int i = 0; i < dellist.Count; i++)
-            //{
-            //    BUseDrugsReport.Delete(dellist[i]);
-            //}
-            //MessageBox.Show("导入成功", "系统提示");
-            //LoadDate();
-        }
-
-        private void btndel_Click(object sender, EventArgs e)
-        {
-            if (dgvUseDrugs.SelectedCells == null || dgvUseDrugs.SelectedCells.Count <= 0) return;
-            int i = 0;
-            DataGridViewRow item = dgvUseDrugs.Rows[dgvUseDrugs.SelectedCells[0].RowIndex];
-            string SelectId = item.Cells[0].Value.ToString();// as string; 
-            i += BUseDrugsReport.Delete(" Id=" + Convert.ToInt32(SelectId), null);
-            if (i > 0)
-            {
-                MessageBox.Show("删除成功", "系统提示");
-                LoadDate();
-            }
-
-        }
-        public void insertOrupdate(UseDrugsReport temp)
-        {
-            bool istrue = false;
-            if (lists != null && lists.Count != 0)
-            {
-                foreach (var item in lists)
-                {
-                    if (temp.加药时间 == item.加药时间 &&
-                     temp.用药Id == item.用药Id &&
-                     temp.住院号 == item.住院号 &&
-                     temp.药品名称 == item.药品名称)
-                    {
-                        istrue = true;
-                        //if (item.用量 != temp.用量)
-                        //{
-                        //    item.用量 = temp.用量;
-                        //    BUseDrugsReport.Update(item);
-                        //}
-                    }
-                }
-            }
-            if (istrue == false)
-                BUseDrugsReport.Insert(temp);
-        }
-        private void tsbLead_Click(object sender, EventArgs e)
-        {
-            //GoldPrinter.ExcelAccess excel = new GoldPrinter.ExcelAccess();
-            //string strFileName = "精一药品使用记录单.xlt"; //模板文件名  
-            //string strExcelTemplateFile = AppDomain.CurrentDomain.BaseDirectory;
-            //strExcelTemplateFile += @"\printTemplate\" + strFileName;
-            //excel.Open(strExcelTemplateFile); //用模板文件
-            //int rowNum = 4;
-            //string Letters = "A B C D E F G H I J K L M N O P Q R";
-            //string[] letter = Letters.Split(' ');
-            //DateTime dtBegin = reBeginTime(dtpBegin.Value, "begin");
-            //DateTime dtEnd = reBeginTime(dtpEnd.Value, "end");
-            //if (_record != null)
-            //{
-            //    dtBegin = reBeginTime(_record.InRoomTime.Value, "begin");
-            //    dtEnd = reBeginTime(_record.InRoomTime.Value, "end");
-            //    lists = BUseDrugsReportManager.GetListByDateTimeWork(dtBegin.ToString(), dtEnd.ToString(), _record.Id.Value);
-            //}
-            //else
-            //{
-            //    lists = BUseDrugsReportManager.GetListByDateTime(dtBegin.ToString(), dtEnd.ToString());
-            //}
-            //for (int j = 0; j < lists.Count; j++)
-            //{
-            //    rowNum++;
-            //    UseDrugsReport temp = lists[j];
-            //    string enter = temp.Enter == 1 ? "√" : "";
-            //    excel.GetRange(rowNum, "A", rowNum, "R").RowHeight = 24.75;
-            //    excel.GetRange(rowNum, "A", rowNum, "R").Borders.LineStyle = Microsoft.Office.Interop.Excel.XlLineStyle.xlContinuous;
-            //    excel.GetRange(rowNum, "A", rowNum, "P").Value = new string[]{
-            //        (j+1).ToString(),
-            //        temp.使用日期,
-            //        temp.术间,
-            //        temp.患者姓名,
-            //        temp.住院号  ,
-            //        temp.药品名称,
-            //        temp.处方剂量,
-            //        temp.批号,
-            //        temp.用量,
-            //        temp.残留剂量,
-            //        temp.残液处理方式,
-            //        temp.镇痛泵使用量,
-            //        temp.镇痛泵余量,
-            //        temp.处方医师,
-            //        temp.医生签名2,
-            //        enter
-            //    };
-                 
-            //}
-            //excel.PrintPreview();
-            //this.Focus();
-            //excel.Close();
-        }
-
-        Object cellTempValue = null;
-        private void dgvUseDrugs_CellBeginEdit(object sender, DataGridViewCellCancelEventArgs e)
-        {
-            cellTempValue = dgvUseDrugs.Rows[e.RowIndex].Cells[e.ColumnIndex].Value;
-        }
-
-        private void dgvUseDrugs_CellEndEdit(object sender, DataGridViewCellEventArgs e)
-        {
-            DataGridViewCell dc = dgvUseDrugs.Rows[e.RowIndex].Cells[e.ColumnIndex];
-            try
-            {
-                if (Object.Equals(cellTempValue, dc.Value))
-                {
-                    //如果没有修改，则返回
-                    return;
-                }
-                dgvUseDrugs.CurrentRow.Cells["State"].Value = 0;
-            }
-            catch (Exception)
-            {
-                dc.Value = cellTempValue;
-            }
-        }
-
-        private void SetValue(int RowIndex)
-        {
-            UseDrugsReport temp = new UseDrugsReport();
-            if (dgvUseDrugs.Rows[RowIndex].Cells["id"].Value != null) temp.Id = int.Parse(dgvUseDrugs.Rows[RowIndex].Cells["id"].Value.ToString());
-            if (dgvUseDrugs.Rows[RowIndex].Cells["用药Id"].Value != null) temp.用药Id = int.Parse(dgvUseDrugs.Rows[RowIndex].Cells["用药Id"].Value.ToString());
-            if (dgvUseDrugs.Rows[RowIndex].Cells["加药时间"].Value != null) temp.加药时间 = DateTime.Parse(dgvUseDrugs.Rows[RowIndex].Cells["加药时间"].Value.ToString());
-            if (dgvUseDrugs.Rows[RowIndex].Cells["使用日期"].Value != null) temp.使用日期 = dgvUseDrugs.Rows[RowIndex].Cells["使用日期"].Value.ToString();
-            if (dgvUseDrugs.Rows[RowIndex].Cells["患者姓名"].Value != null) temp.患者姓名 = dgvUseDrugs.Rows[RowIndex].Cells["患者姓名"].Value.ToString();
-            else temp.患者姓名 = "";
-            if (dgvUseDrugs.Rows[RowIndex].Cells["性别"].Value != null) temp.性别 = dgvUseDrugs.Rows[RowIndex].Cells["性别"].Value.ToString();
-            else temp.性别 = "";
-            if (dgvUseDrugs.Rows[RowIndex].Cells["年龄"].Value != null) temp.年龄 = dgvUseDrugs.Rows[RowIndex].Cells["年龄"].Value.ToString();
-            else temp.年龄 = "";
-            if (dgvUseDrugs.Rows[RowIndex].Cells["住院号"].Value != null) temp.住院号 = dgvUseDrugs.Rows[RowIndex].Cells["住院号"].Value.ToString();
-            else temp.住院号 = "";
-            if (dgvUseDrugs.Rows[RowIndex].Cells["病历号"].Value != null) temp.病历号 = dgvUseDrugs.Rows[RowIndex].Cells["病历号"].Value.ToString();
-            if (dgvUseDrugs.Rows[RowIndex].Cells["术间"].Value != null) temp.术间 = dgvUseDrugs.Rows[RowIndex].Cells["术间"].Value.ToString();
-            else temp.病历号 = "";
-            if (dgvUseDrugs.Rows[RowIndex].Cells["身份证号码"].Value != null) temp.身份证号码 = dgvUseDrugs.Rows[RowIndex].Cells["身份证号码"].Value.ToString();
-            else temp.身份证号码 = "";
-            if (dgvUseDrugs.Rows[RowIndex].Cells["疾病名称"].Value != null) temp.疾病名称 = dgvUseDrugs.Rows[RowIndex].Cells["疾病名称"].Value.ToString();
-            else temp.疾病名称 = "";
-            if (dgvUseDrugs.Rows[RowIndex].Cells["药品名称"].Value != null) temp.药品名称 = dgvUseDrugs.Rows[RowIndex].Cells["药品名称"].Value.ToString();
-            else temp.药品名称 = "";
-            if (dgvUseDrugs.Rows[RowIndex].Cells["批号"].Value != null) temp.批号 = dgvUseDrugs.Rows[RowIndex].Cells["批号"].Value.ToString();
-            else temp.批号 = "";
-            if (dgvUseDrugs.Rows[RowIndex].Cells["处方剂量"].Value != null) temp.处方剂量 = dgvUseDrugs.Rows[RowIndex].Cells["处方剂量"].Value.ToString();
-            else temp.处方剂量 = "";
-            if (dgvUseDrugs.Rows[RowIndex].Cells["用量"].Value != null) temp.用量 = dgvUseDrugs.Rows[RowIndex].Cells["用量"].Value.ToString();
-            else temp.用量 = "";
-            if (dgvUseDrugs.Rows[RowIndex].Cells["残留剂量"].Value != null) temp.残留剂量 = dgvUseDrugs.Rows[RowIndex].Cells["残留剂量"].Value.ToString();
-            else temp.残留剂量 = "";
-            if (dgvUseDrugs.Rows[RowIndex].Cells["残液处理方式"].Value != null) temp.残液处理方式 = dgvUseDrugs.Rows[RowIndex].Cells["残液处理方式"].Value.ToString();
-            else temp.残液处理方式 = "";
-            if (dgvUseDrugs.Rows[RowIndex].Cells["残液处理地点"].Value != null) temp.残液处理地点 = dgvUseDrugs.Rows[RowIndex].Cells["残液处理地点"].Value.ToString();
-            else temp.残液处理地点 = "";
-            if (dgvUseDrugs.Rows[RowIndex].Cells["处方医师"].Value != null) temp.处方医师 = dgvUseDrugs.Rows[RowIndex].Cells["处方医师"].Value.ToString();
-            else temp.处方医师 = "";
-            if (dgvUseDrugs.Rows[RowIndex].Cells["剩余药品弃取记录"].Value != null) temp.剩余药品弃取记录 = dgvUseDrugs.Rows[RowIndex].Cells["剩余药品弃取记录"].Value.ToString();
-            else temp.剩余药品弃取记录 = "";
-            if (dgvUseDrugs.Rows[RowIndex].Cells["执行护士"].Value != null) temp.执行护士 = dgvUseDrugs.Rows[RowIndex].Cells["执行护士"].Value.ToString();
-            else temp.执行护士 = "";
-            if (dgvUseDrugs.Rows[RowIndex].Cells["复核人"].Value != null) temp.复核人 = dgvUseDrugs.Rows[RowIndex].Cells["复核人"].Value.ToString();
-            else temp.复核人 = "";
-            if (dgvUseDrugs.Rows[RowIndex].Cells["核对护士"].Value != null) temp.核对护士 = dgvUseDrugs.Rows[RowIndex].Cells["核对护士"].Value.ToString();
-            else temp.核对护士 = "";
-
-             
-            BUseDrugsReport.Update(temp);
-        }
-
-
-
-        /// <summary>
-        /// 返回指定格式的日期
-        /// </summary>
-        /// <param name="dt">传入的日期</param>
-        /// <param name="flag">标记，begin,end,其它任务标记全返回输入的日期</param>
-        /// <returns></returns>
-        public DateTime reBeginTime(DateTime dt, string flag)
-        {
-            if (flag == "begin") return dt.Date.AddSeconds(1);
-            if (flag == "end") return dt.Date.AddHours(23).AddMinutes(59).AddSeconds(59);
-            return dt;
-        }
-
-        private void dgvUseDrugs_CellClick(object sender, DataGridViewCellEventArgs e)
-        {
-            if (dgvUseDrugs.CurrentCell != null)
-            {
-                if (lbDrugs.Visible == true)
-                {
-                    lbDrugs.Items.Clear();
-                    lbDrugs.Items0.Clear();
-                    lbDrugs.Visible = false;
-                    return;
-                }
-                //this.lbDrugs.Visible = false;
-            }
-             
-        }
-
-        #region 动态添加药品收费项
-        /// <summary>
-        /// 当前单元格内容发生改变时，将改变提交
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void dgvUseDrugs_CurrentCellDirtyStateChanged(object sender, EventArgs e)
-        {
-            if (dgvUseDrugs.IsCurrentCellDirty)
-            {
-                dgvUseDrugs.CommitEdit(DataGridViewDataErrorContexts.Commit);
-            }
-        }
-        private void dgvUseDrugs_CellValueChanged(object sender, DataGridViewCellEventArgs e)
-        {
-            if (dgvUseDrugs == null)
-            {
-                return;
-            }
-            //判断如果事件名称列内容发生变化时（输入关键字），设置显示查询结果的控件的位置及内容
-            if (e.ColumnIndex == 13)
-            {
-                if (dgvUseDrugs.CurrentCell == null) return;
-                if (dgvUseDrugs.CurrentCell.Value == null)
-                {
-                    lbDrugs.Items.Clear();
-                    lbDrugs.Items0.Clear();
-                    lbDrugs.Visible = false;
-                    return;
-                }
-                //获取当前选择的单元格的位置和大小
-
-                Rectangle rect = dgvUseDrugs.GetCellDisplayRectangle(dgvUseDrugs.CurrentCell.ColumnIndex, dgvUseDrugs.CurrentCell.RowIndex, false);
-                if (e.RowIndex < dgvUseDrugs.Height / rect.Height / 2)
-                {
-                    lbDrugs.Top = rect.Bottom;
-                    lbDrugs.Left = rect.Left;
-                    lbDrugs.Width = (int)(rect.Width * 1.3);
-                }
-                else
-                {
-                    lbDrugs.Top = rect.Bottom - rect.Height * 7;
-                    lbDrugs.Left = rect.Left + 173;
-                    lbDrugs.Width = (int)(rect.Width * 1.3);
-                }
-                lbDrugs.Items.Clear();
-                lbDrugs.Items0.Clear();
-                //设置显示高度及内容
-                showDrugs(dgvUseDrugs.CurrentCell.Value.ToString(), 0);
-            }
-            else
-            {
-                this.lbDrugs.Visible = false;
-            }
-        }
-
-        /// <summary>
-        /// 设置显示查询结果的控件的高度及内容
-        /// </summary>
-        /// <param name="str"></param>
-        /// <param name="stype"></param>
-        private void showDrugs(string str, int stype)
-        {
-            List<string> listNew = BUseDrugsReport.getUseDrugsReportNo(str);
-            //根据表格的记录数确定列表控件的高度，并将数据添加到列表控件
-            try
-            {
-                //获取当前选择的单元格的位置和大小
-                Rectangle rect = dgvUseDrugs.GetCellDisplayRectangle(dgvUseDrugs.CurrentCell.ColumnIndex, dgvUseDrugs.CurrentCell.RowIndex, false);
-                int num = listNew.Count;
-                if (num > 0)
-                {
-                    lbDrugs.Height = (rect.Height) * 5;
-                }
-                else if (num == 0)
-                {
-                    lbDrugs.Visible = false;
-                }
-                if (num > 0)
-                {
-                    for (int i = 0; i < listNew.Count; i++)
-                    {
-                        lbDrugs.Items.Add(listNew[i]);
-                        lbDrugs.Items0.Add(listNew[i]);
-                    }
-                    lbDrugs.SelectedIndex = 0;
-                    lbDrugs.Visible = true;
-                }
-            }
-            catch (Exception exp)
-            {
-                PublicMethod.WriteLog(exp, ""); return;
-            }
-        }
-        /// <summary>
-        /// 选择项编号
-        /// </summary>
-        public int _DrugitemId;
-        /// <summary>
-        /// 鼠标点击将选中项的内容写到当前的单元格内并清理隐藏选择控件
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void lbDrugs_MouseClick(object sender, MouseEventArgs e)
-        {
-            selectDrugObj(lbDrugs, dgvUseDrugs.CurrentCell, ref _DrugitemId);
-        }
-        /// <summary>
-        /// 将选中项的内容写到当前的单元格内并清理隐藏选择控件
-        /// </summary>
-        /// <param name="lb"></param>
-        /// <param name="tb"></param>
-        /// <param name="objID"></param>
-        private void selectDrugObj(MyListBox lb, DataGridViewCell tb, ref int objID)
-        {
-            if (lb.SelectedIndex >= 0)
-            {
-                string CODE = lb.Items0[lb.SelectedIndex].ToString();
-
-                dgvUseDrugs.CurrentRow.Cells[13].Value = CODE;
-                //SetValue(dgvUseDrugs.CurrentRow.Index);
-                lb.Visible = false;
-                lb.Items.Clear();
-                lb.Items0.Clear();
-            }
-        }
-
-        #endregion
-
-        private void dgvUseDrugs_CellDoubleClick(object sender, DataGridViewCellEventArgs e)
-        { 
-            //if (dgvUseDrugs.CurrentCell != null)
-            //{
-            //    if (lbDrugs.Visible == true)
-            //    {
-            //        lbDrugs.Items.Clear();
-            //        lbDrugs.Items0.Clear();
-            //        lbDrugs.Visible = false;
-            //        return;
-            //    }
-            //    //this.lbDrugs.Visible = false;
-            //} 
-        }
-
-        private void btnSave_Click(object sender, EventArgs e)
-        {
-            string message="";
-            if(!ValidInput(out message))
-            {
-                MessageBox.Show(message);
-                return;
-            }
-            int num = 0;
-            int continueNum = 0;
-            foreach(DataGridViewRow r in dgvUseDrugs.Rows)
-            {
-                if(r.Cells["State"].EditedFormattedValue.ToString()=="0")
-                {
-                    UseDrugsReport temp = new UseDrugsReport();
-                    if (r.Cells["id"].Value != null) temp.Id = int.Parse(r.Cells["id"].Value.ToString());
-                    if (r.Cells["用药Id"].Value != null) temp.用药Id = int.Parse(r.Cells["用药Id"].Value.ToString());
-                    if (r.Cells["加药时间"].Value != null) temp.加药时间 = DateTime.Parse(r.Cells["加药时间"].Value.ToString());
-                    if (r.Cells["使用日期"].Value != null) temp.使用日期 = r.Cells["使用日期"].Value.ToString();
-                    if (r.Cells["患者姓名"].Value != null) temp.患者姓名 = r.Cells["患者姓名"].Value.ToString();
-                    else temp.患者姓名 = "";
-                    if (r.Cells["性别"].Value != null) temp.性别 = r.Cells["性别"].Value.ToString();
-                    else temp.性别 = "";
-                    if (r.Cells["年龄"].Value != null) temp.年龄 = r.Cells["年龄"].Value.ToString();
-                    else temp.年龄 = "";
-                    if (r.Cells["住院号"].Value != null) temp.住院号 = r.Cells["住院号"].Value.ToString();
-                    else temp.住院号 = "";
-                    if (r.Cells["病历号"].Value != null) temp.病历号 = r.Cells["病历号"].Value.ToString();
-                    if (r.Cells["术间"].Value != null) temp.术间 = r.Cells["术间"].Value.ToString();
-                    else temp.病历号 = "";
-                    if (r.Cells["身份证号码"].Value != null) temp.身份证号码 = r.Cells["身份证号码"].Value.ToString();
-                    else temp.身份证号码 = "";
-                    if (r.Cells["疾病名称"].Value != null) temp.疾病名称 = r.Cells["疾病名称"].Value.ToString();
-                    else temp.疾病名称 = "";
-                    if (r.Cells["药品名称"].Value != null) temp.药品名称 = r.Cells["药品名称"].Value.ToString();
-                    else temp.药品名称 = "";
-                    if (r.Cells["批号"].Value != null) temp.批号 = r.Cells["批号"].Value.ToString();
-                    else temp.批号 = "";
-                    if (r.Cells["处方剂量"].Value != null) temp.处方剂量 = r.Cells["处方剂量"].Value.ToString();
-                    else temp.处方剂量 = "";
-                    if (r.Cells["用量"].Value != null) temp.用量 = r.Cells["用量"].Value.ToString();
-                    else temp.用量 = "";
-                    if (r.Cells["残留剂量"].Value != null) temp.残留剂量 = r.Cells["残留剂量"].Value.ToString();
-                    else temp.残留剂量 = "";
-                    if (r.Cells["残液处理方式"].Value != null) temp.残液处理方式 = r.Cells["残液处理方式"].Value.ToString();
-                    else temp.残液处理方式 = "";
-                    if (r.Cells["残液处理地点"].Value != null) temp.残液处理地点 = r.Cells["残液处理地点"].Value.ToString();
-                    else temp.残液处理地点 = "";
-
-                    if (r.Cells["镇痛泵使用量"].Value != null) temp.镇痛泵使用量 = r.Cells["镇痛泵使用量"].Value.ToString();
-                    else temp.镇痛泵使用量 = "";
-                    if (r.Cells["镇痛泵余量"].Value != null) temp.镇痛泵余量 = r.Cells["镇痛泵余量"].Value.ToString();
-                    else temp.镇痛泵余量 = "";
-
-                    if (r.Cells["处方医师"].Value != null) temp.处方医师 = r.Cells["处方医师"].Value.ToString();
-                    else temp.处方医师 = "";
-                    if (r.Cells["剩余药品弃取记录"].Value != null) temp.剩余药品弃取记录 = r.Cells["剩余药品弃取记录"].Value.ToString();
-                    else temp.剩余药品弃取记录 = "";
-                    if (r.Cells["执行护士"].Value != null) temp.执行护士 = r.Cells["执行护士"].Value.ToString();
-                    else temp.执行护士 = "";
-                    if (r.Cells["复核人"].Value != null) temp.复核人 = r.Cells["复核人"].Value.ToString();
-                    else temp.复核人 = "";
-                    if (r.Cells["核对护士"].Value != null) temp.核对护士 = r.Cells["核对护士"].Value.ToString();
-                    else temp.核对护士 = "";
-                    if (r.Cells["医生2"].Value != null) temp.医生签名2 = r.Cells["医生2"].Value.ToString();
-                    else temp.核对护士 = "";
-                     
-                    if (r.Cells["数量"].Value != null) temp.Num = int.Parse(r.Cells["数量"].Value.ToString());
-                    if (r.Cells["单位"].Value != null) temp.SpecUnit = r.Cells["单位"].Value.ToString();
-                    temp.Enter = r.Cells["Enter"].EditedFormattedValue.ToString() == "True" ? 1 : 0;
-                    temp.PatientRecordId = _record.Id;
-                    temp.State = 1;
-
-                    if (r.Tag == null)
-                    {
-                        num = BUseDrugsReport.Insert(temp);
-                    }
-                    else
-                    {
-                        num = BUseDrugsReport.Update(temp);
-                    }
-                }
-                else
-                {
-                    continueNum++;
-                }
-            }
-            if (continueNum == dgvUseDrugs.Rows.Count)
-            {
-                MessageBox.Show("数据已保存！");
-                LoadDate();
-            }
-            if (num > 0)
-            {
-                new frmMessageBox().Show();
-                LoadDate();
-            }
-        }
-        private bool ValidInput(out string message)
-        {
-            bool flag = true;
-            message = "";
-            foreach(DataGridViewRow r in dgvUseDrugs.Rows)
-            {
-                if (r.Cells["批号"].EditedFormattedValue.ToString() == "")
-                {
-                    message = "批号不能为空";
-                    flag = false;
-                    break;
-                }
-                else if (r.Cells["用量"].EditedFormattedValue.ToString() == "")
-                {
-                    message = "使用量不能为空";
-                    flag = false;
-                    break;
-                }
-                else if (r.Cells["数量"].EditedFormattedValue.ToString() == "")
-                {
-                    message = "数量不能为空";
-                    flag = false;
-                    break;
-                }
-                else if (r.Cells["残留剂量"].EditedFormattedValue.ToString() == "")
-                {
-                    message = "剩余量不能为空";
-                    flag = false;
-                    break;
-                }
-                else if (r.Cells["残液处理方式"].EditedFormattedValue.ToString() == "")
-                {
-                    message = "残液处理方式不能为空";
-                    flag = false;
-                    break;
-                }
-                else if(r.Cells["处方医师"].EditedFormattedValue.ToString() == "")
-                {
-                    message = "医生不能空，请返回麻醉记录单页面填写！";
-                    flag = false;
-                    break;
-                }
-                else
-                {
-                    message = "";
-                }
-            }
-            return flag;
-        }
-
-        private void FormUseDrugsReport_FormClosing(object sender, FormClosingEventArgs e)
-        {
-            bool flag = false;
-            foreach(DataGridViewRow r in dgvUseDrugs.Rows)
-            {
-                if(r.Cells["State"].EditedFormattedValue.ToString()=="0")
-                {
-                    flag = true;
-                    break;
-                }
-            }
-            if (flag && stuts == 1)
-            {
-                DialogResult dr = MessageBox.Show("有登记的药品未保存！是否保存？", "系统提示", MessageBoxButtons.YesNo, MessageBoxIcon.Information);
-                if(dr== System.Windows.Forms.DialogResult.Yes)
-                {
-                    btnSave.PerformClick();
-                }
-            }
-        }
-
-        private void btnSaveQuery_Click(object sender, EventArgs e)
-        {
-            int num = 0;
-            foreach(DataGridViewRow r in dgvUseDrugs.Rows)
-            {
-                UseDrugsReport udr = r.Tag as UseDrugsReport;
-                udr.Enter = r.Cells["Enter"].EditedFormattedValue.ToString() == "True" ? 1 : 0;
-                udr.镇痛泵使用量 = r.Cells["镇痛泵使用量"].EditedFormattedValue.ToString();
-                udr.镇痛泵余量 = r.Cells["镇痛泵余量"].EditedFormattedValue.ToString();
-                num = BUseDrugsReport.Update(udr);
-            }
-            if(num>0)
-            {
-                new frmMessageBox().Show();
-            }
-        }
-
-        private void dgvUseDrugs_CellLeave(object sender, DataGridViewCellEventArgs e)
-        {
-            if(dgvUseDrugs.Columns[dgvUseDrugs.CurrentCell.ColumnIndex].HeaderText=="数量" || dgvUseDrugs.Columns[dgvUseDrugs.CurrentCell.ColumnIndex].HeaderText=="用量" || dgvUseDrugs.Columns[dgvUseDrugs.CurrentCell.ColumnIndex].HeaderText=="余量")
-            {
-                decimal num;
-                if(!decimal.TryParse(dgvUseDrugs.CurrentCell.EditedFormattedValue.ToString(),out num))
-                {
-                    MessageBox.Show("请输入数字！");
-                }
-            }
-        }
-         
-
-        private void chkAll_CheckedChanged(object sender, EventArgs e)
-        {
-            foreach(DataGridViewRow row in dgvUseDrugs.Rows)
-            {
-                row.Cells["Enter"].Value = chkAll.Checked;
-            }
-        }
-    }
-}

AIMS/OperationFront/frmOperationSchedulePlan.cs

@@ -4227,7 +4227,7 @@ namespace AIMS.OperationFront.UI
 
         private void btnWorkPlan_Click(object sender, EventArgs e)
         {
-            FrmScheduling2 fw = new FrmScheduling2();
+            frmPersonSchedul fw = new frmPersonSchedul();
             fw.Show();
         }
         #endregion

AIMS/OperationFront/frmPersonSchedul.cs

@@ -11,9 +11,9 @@ using DCSoftDotfuscate;
 
 namespace AIMS.OperationFront.UI
 {
-    public partial class FrmScheduling2 : Form
+    public partial class frmPersonSchedul : Form
     {
-        public FrmScheduling2()
+        public frmPersonSchedul()
         {
             InitializeComponent();
         }
@@ -1339,7 +1339,7 @@ namespace AIMS.OperationFront.UI
             GetDataTableSchedulingNew();
         }
 
-        private FrmScheduling2Option formOption = new FrmScheduling2Option();
+        private frmPersonSchedulOption formOption = new frmPersonSchedulOption();
         private void dataGridView1_CellMouseDown(object sender, DataGridViewCellMouseEventArgs e)
         {
             /*在主排班表格的日期格上点鼠标右键, 进行排班设置*/
@@ -1516,7 +1516,7 @@ namespace AIMS.OperationFront.UI
 
         private void btnAttendance_Click(object sender, EventArgs e)
         {
-            FrmScheduling3 form = new FrmScheduling3();
+            frmPersonSchedulKeep form = new frmPersonSchedulKeep();
             form.Show();
         }
         private void btnPrint_Click(object sender, EventArgs e)

AIMS/OperationFront/frmPersonSchedul.designer.cs

@@ -1,6 +1,6 @@
 namespace AIMS.OperationFront.UI
 {
-    partial class FrmScheduling2
+    partial class frmPersonSchedul
     {
         /// <summary>
         /// Required designer variable.
@@ -45,7 +45,7 @@
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmScheduling2));
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmPersonSchedul));
             this.panelAll = new System.Windows.Forms.Panel();
             this.panelBody = new System.Windows.Forms.Panel();
             this.panelBodyB = new System.Windows.Forms.Panel();

AIMS/OperationFront/frmPersonSchedulKeep.cs

@@ -11,7 +11,7 @@ using System.Windows.Forms;
 
 namespace AIMS.OperationFront.UI
 {
-    public partial class FrmScheduling3 : Form
+    public partial class frmPersonSchedulKeep : Form
     {
 
         private bool isDataLoaded = false;
@@ -25,7 +25,7 @@ namespace AIMS.OperationFront.UI
         private Dictionary<string, int> dicSchedulingTypeNameId = new Dictionary<string, int>();
 
         private GPDbHelper dbHelper = new GPDbHelper();
-        public FrmScheduling3()
+        public frmPersonSchedulKeep()
         {
             InitializeComponent();
         }