Merge branch 'Andru-MIC看板优化' into master-prod-new

Andru

2024-01-11 b8e289772b0999f9be4b6f0d286e3e62b9654584

Merge branch 'Andru-MIC看板优化' into master-prod-new

* Andru-MIC看板优化:
  添加是否发送到店提醒短信提醒字段
  添加Mic标注字段

 phi_platform_common/src/main/resources/mapper/platform/AppointmentMapper.xml

@@ -8,7 +8,7 @@
    <!-- 整个实体类修改，表字段=实体类字段-->
    <sql id="Update_Column_All">
        <trim prefixOverrides=",">
            ,shopId = #{shopId},doctorId = #{doctorId},obeyDoctor = #{obeyDoctor},userId = #{userId},nurseId = #{nurseId},startTime = #{startTime},endTime = #{endTime},duration = #{duration},corpUserId = #{corpUserId},createCorpUserId = #{createCorpUserId},createRoleId = #{createRoleId},createRoleStr = #{createRoleStr},createManId = #{createManId},createManName = #{createManName},createManType = #{createManType},visitType = #{visitType},appType = #{appType},comDuration = #{comDuration},docComDuration = #{docComDuration},readyDuration = #{readyDuration},proDuration = #{proDuration},treatDuration = #{treatDuration},comRoomId = #{comRoomId},treatRoomId = #{treatRoomId},remark = #{remark},obeyTime = #{obeyTime},status = #{status},approveAdmin = #{approveAdmin},approveRemark = #{approveRemark},cancelApproveRemark = #{cancelApproveRemark},dayStr = #{dayStr},weekStr = #{weekStr},monthStr = #{monthStr},isSwitch = #{isSwitch},notifyStatus = #{notifyStatus},isModify = #{isModify},isApproveModify = #{isApproveModify},isMicApprove = #{isMicApprove},cancelStatus = #{cancelStatus},cancelType = #{cancelType},cancelRemark = #{cancelRemark},isArrive = #{isArrive},projectNames = #{projectNames},projectIds = #{projectIds},imgUrls = #{imgUrls},isReadyNotify = #{isReadyNotify},isUnArriveNotify = #{isUnArriveNotify},applyCancelTime = #{applyCancelTime},arriveTime = #{arriveTime},realDuration = #{realDuration},realComDuration = #{realComDuration},realProDuration = #{realProDuration},realDocComDuration = #{realDocComDuration},realTreatDuration = #{realTreatDuration},realReadyDuration = #{realReadyDuration},isAnaesthesia = #{isAnaesthesia},apiId = #{apiId},needSync = #{needSync},corpUserTeamId = #{corpUserTeamId},projectJson = #{projectJson},activityDayId = #{activityDayId},addMode = #{addMode},recordType = #{recordType},relationId = #{relationId},waitDuration = #{waitDuration},realWaitDuration = #{realWaitDuration},palsyDuration = #{palsyDuration},realPalsyDuration = #{realPalsyDuration},doctorZlDuration = #{doctorZlDuration},isLifeBeauty = #{isLifeBeauty},isSendMsg = #{isSendMsg},deductionNum = #{deductionNum},isPretriage = #{isPretriage},isAutoTriage = #{isAutoTriage},sourceId = #{sourceId},isDel = #{isDel},createTime = #{createTime},editTime = #{editTime}
            ,shopId = #{shopId},doctorId = #{doctorId},obeyDoctor = #{obeyDoctor},userId = #{userId},nurseId = #{nurseId},startTime = #{startTime},endTime = #{endTime},specialUser = #{specialUser},duration = #{duration},corpUserId = #{corpUserId},createCorpUserId = #{createCorpUserId},createRoleId = #{createRoleId},createRoleStr = #{createRoleStr},createManId = #{createManId},createManName = #{createManName},createManType = #{createManType},visitType = #{visitType},appType = #{appType},comDuration = #{comDuration},docComDuration = #{docComDuration},readyDuration = #{readyDuration},proDuration = #{proDuration},treatDuration = #{treatDuration},comRoomId = #{comRoomId},treatRoomId = #{treatRoomId},remark = #{remark},obeyTime = #{obeyTime},status = #{status},approveAdmin = #{approveAdmin},approveRoleCode = #{approveRoleCode},approveRemark = #{approveRemark},cancelApproveRemark = #{cancelApproveRemark},dayStr = #{dayStr},weekStr = #{weekStr},monthStr = #{monthStr},isSwitch = #{isSwitch},occupySwitch = #{occupySwitch},rulePreType = #{rulePreType},notifyStatus = #{notifyStatus},isModify = #{isModify},isApproveModify = #{isApproveModify},isMicApprove = #{isMicApprove},cancelStatus = #{cancelStatus},cancelType = #{cancelType},cancelRemark = #{cancelRemark},isArrive = #{isArrive},projectNames = #{projectNames},projectIds = #{projectIds},imgUrls = #{imgUrls},isReadyNotify = #{isReadyNotify},isUnArriveNotify = #{isUnArriveNotify},applyCancelTime = #{applyCancelTime},arriveTime = #{arriveTime},realDuration = #{realDuration},realComDuration = #{realComDuration},realProDuration = #{realProDuration},realDocComDuration = #{realDocComDuration},realTreatDuration = #{realTreatDuration},realReadyDuration = #{realReadyDuration},isAnaesthesia = #{isAnaesthesia},apiId = #{apiId},needSync = #{needSync},corpUserTeamId = #{corpUserTeamId},projectJson = #{projectJson},activityDayId = #{activityDayId},addMode = #{addMode},recordType = #{recordType},relationId = #{relationId},waitDuration = #{waitDuration},realWaitDuration = #{realWaitDuration},palsyDuration = #{palsyDuration},realPalsyDuration = #{realPalsyDuration},doctorZlDuration = #{doctorZlDuration},isLifeBeauty = #{isLifeBeauty},isSendMsg = #{isSendMsg},isArriveSendMsg = #{isArriveSendMsg},deductionNum = #{deductionNum},isPretriage = #{isPretriage},isAutoTriage = #{isAutoTriage},sourceId = #{sourceId},orStartTime = #{orStartTime},cancelTime = #{cancelTime},approveTime = #{approveTime},isUpOrder = #{isUpOrder},micRemark = #{micRemark},isDel = #{isDel},createTime = #{createTime},editTime = #{editTime}
        </trim>
    </sql>
     
@@ -19,11 +19,11 @@
        <selectKey keyProperty="id" resultType="String" order="BEFORE">
               select replace(uuid(),'-','') from dual
        </selectKey>
        insert into appointment (id,shopId,doctorId,obeyDoctor,userId,nurseId,startTime,endTime,duration,corpUserId,createCorpUserId,createRoleId,createRoleStr,createManId,createManName,createManType,visitType,appType,comDuration,docComDuration,readyDuration,proDuration,treatDuration,comRoomId,treatRoomId,remark,obeyTime,status,approveAdmin,approveRemark,cancelApproveRemark,dayStr,weekStr,monthStr,isSwitch,notifyStatus,isModify,isApproveModify,isMicApprove,cancelStatus,cancelType,cancelRemark,isArrive,projectNames,projectIds,imgUrls,isReadyNotify,isUnArriveNotify,applyCancelTime,arriveTime,realDuration,realComDuration,realProDuration,realDocComDuration,realTreatDuration,realReadyDuration,isAnaesthesia,apiId,needSync,corpUserTeamId,projectJson,activityDayId,addMode,recordType,relationId,waitDuration,realWaitDuration,palsyDuration,realPalsyDuration,doctorZlDuration,isLifeBeauty,isSendMsg,deductionNum,isPretriage,isAutoTriage,sourceId,isDel,createTime,editTime)  values (#{id},#{shopId},#{doctorId},#{obeyDoctor},#{userId},#{nurseId},#{startTime},#{endTime},#{duration},#{corpUserId},#{createCorpUserId},#{createRoleId},#{createRoleStr},#{createManId},#{createManName},#{createManType},#{visitType},#{appType},#{comDuration},#{docComDuration},#{readyDuration},#{proDuration},#{treatDuration},#{comRoomId},#{treatRoomId},#{remark},#{obeyTime},#{status},#{approveAdmin},#{approveRemark},#{cancelApproveRemark},#{dayStr},#{weekStr},#{monthStr},#{isSwitch},#{notifyStatus},#{isModify},#{isApproveModify},#{isMicApprove},#{cancelStatus},#{cancelType},#{cancelRemark},#{isArrive},#{projectNames},#{projectIds},#{imgUrls},#{isReadyNotify},#{isUnArriveNotify},#{applyCancelTime},#{arriveTime},#{realDuration},#{realComDuration},#{realProDuration},#{realDocComDuration},#{realTreatDuration},#{realReadyDuration},#{isAnaesthesia},#{apiId},#{needSync},#{corpUserTeamId},#{projectJson},#{activityDayId},#{addMode},#{recordType},#{relationId},#{waitDuration},#{realWaitDuration},#{palsyDuration},#{realPalsyDuration},#{doctorZlDuration},#{isLifeBeauty},#{isSendMsg},#{deductionNum},#{isPretriage},#{isAutoTriage},#{sourceId},#{isDel},#{createTime},#{editTime})
        insert into appointment (id,shopId,doctorId,obeyDoctor,userId,nurseId,startTime,endTime,specialUser,duration,corpUserId,createCorpUserId,createRoleId,createRoleStr,createManId,createManName,createManType,visitType,appType,comDuration,docComDuration,readyDuration,proDuration,treatDuration,comRoomId,treatRoomId,remark,obeyTime,status,approveAdmin,approveRoleCode,approveRemark,cancelApproveRemark,dayStr,weekStr,monthStr,isSwitch,occupySwitch,rulePreType,notifyStatus,isModify,isApproveModify,isMicApprove,cancelStatus,cancelType,cancelRemark,isArrive,projectNames,projectIds,imgUrls,isReadyNotify,isUnArriveNotify,applyCancelTime,arriveTime,realDuration,realComDuration,realProDuration,realDocComDuration,realTreatDuration,realReadyDuration,isAnaesthesia,apiId,needSync,corpUserTeamId,projectJson,activityDayId,addMode,recordType,relationId,waitDuration,realWaitDuration,palsyDuration,realPalsyDuration,doctorZlDuration,isLifeBeauty,isSendMsg,isArriveSendMsg,deductionNum,isPretriage,isAutoTriage,sourceId,orStartTime,cancelTime,approveTime,isUpOrder,micRemark,isDel,createTime,editTime)  values (#{id},#{shopId},#{doctorId},#{obeyDoctor},#{userId},#{nurseId},#{startTime},#{endTime},#{specialUser},#{duration},#{corpUserId},#{createCorpUserId},#{createRoleId},#{createRoleStr},#{createManId},#{createManName},#{createManType},#{visitType},#{appType},#{comDuration},#{docComDuration},#{readyDuration},#{proDuration},#{treatDuration},#{comRoomId},#{treatRoomId},#{remark},#{obeyTime},#{status},#{approveAdmin},#{approveRoleCode},#{approveRemark},#{cancelApproveRemark},#{dayStr},#{weekStr},#{monthStr},#{isSwitch},#{occupySwitch},#{rulePreType},#{notifyStatus},#{isModify},#{isApproveModify},#{isMicApprove},#{cancelStatus},#{cancelType},#{cancelRemark},#{isArrive},#{projectNames},#{projectIds},#{imgUrls},#{isReadyNotify},#{isUnArriveNotify},#{applyCancelTime},#{arriveTime},#{realDuration},#{realComDuration},#{realProDuration},#{realDocComDuration},#{realTreatDuration},#{realReadyDuration},#{isAnaesthesia},#{apiId},#{needSync},#{corpUserTeamId},#{projectJson},#{activityDayId},#{addMode},#{recordType},#{relationId},#{waitDuration},#{realWaitDuration},#{palsyDuration},#{realPalsyDuration},#{doctorZlDuration},#{isLifeBeauty},#{isSendMsg},#{isArriveSendMsg},#{deductionNum},#{isPretriage},#{isAutoTriage},#{sourceId},#{orStartTime},#{cancelTime},#{approveTime},#{isUpOrder},#{micRemark},#{isDel},#{createTime},#{editTime})
    </insert>

    <insert id="insertById" parameterType="com.hx.phiappt.model.Appointment">
        insert into appointment (id,shopId,doctorId,obeyDoctor,userId,nurseId,startTime,endTime,duration,corpUserId,createCorpUserId,createRoleId,createRoleStr,createManId,createManName,createManType,visitType,appType,comDuration,docComDuration,readyDuration,proDuration,treatDuration,comRoomId,treatRoomId,remark,obeyTime,status,approveAdmin,approveRemark,cancelApproveRemark,dayStr,weekStr,monthStr,isSwitch,notifyStatus,isModify,isApproveModify,isMicApprove,cancelStatus,cancelType,cancelRemark,isArrive,projectNames,projectIds,imgUrls,isReadyNotify,isUnArriveNotify,applyCancelTime,arriveTime,realDuration,realComDuration,realProDuration,realDocComDuration,realTreatDuration,realReadyDuration,isAnaesthesia,apiId,needSync,corpUserTeamId,projectJson,activityDayId,addMode,recordType,relationId,waitDuration,realWaitDuration,palsyDuration,realPalsyDuration,doctorZlDuration,isLifeBeauty,isSendMsg,deductionNum,isPretriage,isAutoTriage,sourceId,isDel,createTime,editTime)  values (#{id},#{shopId},#{doctorId},#{obeyDoctor},#{userId},#{nurseId},#{startTime},#{endTime},#{duration},#{corpUserId},#{createCorpUserId},#{createRoleId},#{createRoleStr},#{createManId},#{createManName},#{createManType},#{visitType},#{appType},#{comDuration},#{docComDuration},#{readyDuration},#{proDuration},#{treatDuration},#{comRoomId},#{treatRoomId},#{remark},#{obeyTime},#{status},#{approveAdmin},#{approveRemark},#{cancelApproveRemark},#{dayStr},#{weekStr},#{monthStr},#{isSwitch},#{notifyStatus},#{isModify},#{isApproveModify},#{isMicApprove},#{cancelStatus},#{cancelType},#{cancelRemark},#{isArrive},#{projectNames},#{projectIds},#{imgUrls},#{isReadyNotify},#{isUnArriveNotify},#{applyCancelTime},#{arriveTime},#{realDuration},#{realComDuration},#{realProDuration},#{realDocComDuration},#{realTreatDuration},#{realReadyDuration},#{isAnaesthesia},#{apiId},#{needSync},#{corpUserTeamId},#{projectJson},#{activityDayId},#{addMode},#{recordType},#{relationId},#{waitDuration},#{realWaitDuration},#{palsyDuration},#{realPalsyDuration},#{doctorZlDuration},#{isLifeBeauty},#{isSendMsg},#{deductionNum},#{isPretriage},#{isAutoTriage},#{sourceId},#{isDel},#{createTime},#{editTime})
        insert into appointment (id,shopId,doctorId,obeyDoctor,userId,nurseId,startTime,endTime,specialUser,duration,corpUserId,createCorpUserId,createRoleId,createRoleStr,createManId,createManName,createManType,visitType,appType,comDuration,docComDuration,readyDuration,proDuration,treatDuration,comRoomId,treatRoomId,remark,obeyTime,status,approveAdmin,approveRoleCode,approveRemark,cancelApproveRemark,dayStr,weekStr,monthStr,isSwitch,occupySwitch,rulePreType,notifyStatus,isModify,isApproveModify,isMicApprove,cancelStatus,cancelType,cancelRemark,isArrive,projectNames,projectIds,imgUrls,isReadyNotify,isUnArriveNotify,applyCancelTime,arriveTime,realDuration,realComDuration,realProDuration,realDocComDuration,realTreatDuration,realReadyDuration,isAnaesthesia,apiId,needSync,corpUserTeamId,projectJson,activityDayId,addMode,recordType,relationId,waitDuration,realWaitDuration,palsyDuration,realPalsyDuration,doctorZlDuration,isLifeBeauty,isSendMsg,isArriveSendMsg,deductionNum,isPretriage,isAutoTriage,sourceId,orStartTime,cancelTime,approveTime,isUpOrder,micRemark,isDel,createTime,editTime)  values (#{id},#{shopId},#{doctorId},#{obeyDoctor},#{userId},#{nurseId},#{startTime},#{endTime},#{specialUser},#{duration},#{corpUserId},#{createCorpUserId},#{createRoleId},#{createRoleStr},#{createManId},#{createManName},#{createManType},#{visitType},#{appType},#{comDuration},#{docComDuration},#{readyDuration},#{proDuration},#{treatDuration},#{comRoomId},#{treatRoomId},#{remark},#{obeyTime},#{status},#{approveAdmin},#{approveRoleCode},#{approveRemark},#{cancelApproveRemark},#{dayStr},#{weekStr},#{monthStr},#{isSwitch},#{occupySwitch},#{rulePreType},#{notifyStatus},#{isModify},#{isApproveModify},#{isMicApprove},#{cancelStatus},#{cancelType},#{cancelRemark},#{isArrive},#{projectNames},#{projectIds},#{imgUrls},#{isReadyNotify},#{isUnArriveNotify},#{applyCancelTime},#{arriveTime},#{realDuration},#{realComDuration},#{realProDuration},#{realDocComDuration},#{realTreatDuration},#{realReadyDuration},#{isAnaesthesia},#{apiId},#{needSync},#{corpUserTeamId},#{projectJson},#{activityDayId},#{addMode},#{recordType},#{relationId},#{waitDuration},#{realWaitDuration},#{palsyDuration},#{realPalsyDuration},#{doctorZlDuration},#{isLifeBeauty},#{isSendMsg},#{isArriveSendMsg},#{deductionNum},#{isPretriage},#{isAutoTriage},#{sourceId},#{orStartTime},#{cancelTime},#{approveTime},#{isUpOrder},#{micRemark},#{isDel},#{createTime},#{editTime})
    </insert>

    <select id="selectList" resultType="com.hx.phiappt.model.Appointment" parameterType="com.hx.mybatisTool.SqlSentence" >
@@ -55,14 +55,14 @@

    <select id="selectOneByKey" resultType="com.hx.phiappt.model.Appointment" parameterType="java.lang.Object" >
        select 
            id,shopId,doctorId,obeyDoctor,userId,nurseId,startTime,endTime,duration,corpUserId,createCorpUserId,createRoleId,createRoleStr,createManId,createManName,createManType,visitType,appType,comDuration,docComDuration,readyDuration,proDuration,treatDuration,comRoomId,treatRoomId,remark,obeyTime,status,approveAdmin,approveRemark,cancelApproveRemark,dayStr,weekStr,monthStr,isSwitch,notifyStatus,isModify,isApproveModify,isMicApprove,cancelStatus,cancelType,cancelRemark,isArrive,projectNames,projectIds,imgUrls,isReadyNotify,isUnArriveNotify,applyCancelTime,arriveTime,realDuration,realComDuration,realProDuration,realDocComDuration,realTreatDuration,realReadyDuration,isAnaesthesia,apiId,needSync,corpUserTeamId,projectJson,activityDayId,addMode,recordType,relationId,waitDuration,realWaitDuration,palsyDuration,realPalsyDuration,doctorZlDuration,isLifeBeauty,isSendMsg,deductionNum,isPretriage,isAutoTriage,sourceId,isDel,createTime,editTime
            id,shopId,doctorId,obeyDoctor,userId,nurseId,startTime,endTime,specialUser,duration,corpUserId,createCorpUserId,createRoleId,createRoleStr,createManId,createManName,createManType,visitType,appType,comDuration,docComDuration,readyDuration,proDuration,treatDuration,comRoomId,treatRoomId,remark,obeyTime,status,approveAdmin,approveRoleCode,approveRemark,cancelApproveRemark,dayStr,weekStr,monthStr,isSwitch,occupySwitch,rulePreType,notifyStatus,isModify,isApproveModify,isMicApprove,cancelStatus,cancelType,cancelRemark,isArrive,projectNames,projectIds,imgUrls,isReadyNotify,isUnArriveNotify,applyCancelTime,arriveTime,realDuration,realComDuration,realProDuration,realDocComDuration,realTreatDuration,realReadyDuration,isAnaesthesia,apiId,needSync,corpUserTeamId,projectJson,activityDayId,addMode,recordType,relationId,waitDuration,realWaitDuration,palsyDuration,realPalsyDuration,doctorZlDuration,isLifeBeauty,isSendMsg,isArriveSendMsg,deductionNum,isPretriage,isAutoTriage,sourceId,orStartTime,cancelTime,approveTime,isUpOrder,micRemark,isDel,createTime,editTime
        from appointment
        WHERE id = #{value}
    </select>

    <select id="selectOneByKeyBlob" resultType="com.hx.phiappt.model.Appointment" parameterType="java.lang.Object" >
        select 
            id,shopId,doctorId,obeyDoctor,userId,nurseId,startTime,endTime,duration,corpUserId,createCorpUserId,createRoleId,createRoleStr,createManId,createManName,createManType,visitType,appType,comDuration,docComDuration,readyDuration,proDuration,treatDuration,comRoomId,treatRoomId,remark,obeyTime,status,approveAdmin,approveRemark,cancelApproveRemark,dayStr,weekStr,monthStr,isSwitch,notifyStatus,isModify,isApproveModify,isMicApprove,cancelStatus,cancelType,cancelRemark,isArrive,projectNames,projectIds,imgUrls,isReadyNotify,isUnArriveNotify,applyCancelTime,arriveTime,realDuration,realComDuration,realProDuration,realDocComDuration,realTreatDuration,realReadyDuration,isAnaesthesia,apiId,needSync,corpUserTeamId,projectJson,activityDayId,addMode,recordType,relationId,waitDuration,realWaitDuration,palsyDuration,realPalsyDuration,doctorZlDuration,isLifeBeauty,isSendMsg,deductionNum,isPretriage,isAutoTriage,sourceId,isDel,createTime,editTime
            id,shopId,doctorId,obeyDoctor,userId,nurseId,startTime,endTime,specialUser,duration,corpUserId,createCorpUserId,createRoleId,createRoleStr,createManId,createManName,createManType,visitType,appType,comDuration,docComDuration,readyDuration,proDuration,treatDuration,comRoomId,treatRoomId,remark,obeyTime,status,approveAdmin,approveRoleCode,approveRemark,cancelApproveRemark,dayStr,weekStr,monthStr,isSwitch,occupySwitch,rulePreType,notifyStatus,isModify,isApproveModify,isMicApprove,cancelStatus,cancelType,cancelRemark,isArrive,projectNames,projectIds,imgUrls,isReadyNotify,isUnArriveNotify,applyCancelTime,arriveTime,realDuration,realComDuration,realProDuration,realDocComDuration,realTreatDuration,realReadyDuration,isAnaesthesia,apiId,needSync,corpUserTeamId,projectJson,activityDayId,addMode,recordType,relationId,waitDuration,realWaitDuration,palsyDuration,realPalsyDuration,doctorZlDuration,isLifeBeauty,isSendMsg,isArriveSendMsg,deductionNum,isPretriage,isAutoTriage,sourceId,orStartTime,cancelTime,approveTime,isUpOrder,micRemark,isDel,createTime,editTime
        from appointment
        WHERE id = #{value}
    </select>

 phi_platform_common/src/main/resources/mapper/platform/TreatProjectMapper.xml

@@ -8,7 +8,7 @@
    <!-- 整个实体类修改，表字段=实体类字段-->
    <sql id="Update_Column_All">
        <trim prefixOverrides=",">
            ,positionData = #{positionData},projectNo = #{projectNo},projectName = #{projectName},price = #{price},num = #{num},useDuration = #{useDuration},palsyDuration = #{palsyDuration},projectId = #{projectId},treatSingleId = #{treatSingleId},remarkInfo = #{remarkInfo},hisId = #{hisId},isDeduct = #{isDeduct},userProjectItemId = #{userProjectItemId},goodsId = #{goodsId},treatSingleNo = #{treatSingleNo},deductNum = #{deductNum},isUserPro = #{isUserPro},indicationId = #{indicationId},indication = #{indication},partType = #{partType},sdRemark = #{sdRemark},isDel = #{isDel},createTime = #{createTime},editTime = #{editTime}
            ,positionData = #{positionData},projectNo = #{projectNo},projectName = #{projectName},price = #{price},num = #{num},useDuration = #{useDuration},palsyDuration = #{palsyDuration},projectId = #{projectId},treatSingleId = #{treatSingleId},remarkInfo = #{remarkInfo},hisId = #{hisId},isDeduct = #{isDeduct},isUsed = #{isUsed},userProjectItemId = #{userProjectItemId},goodsId = #{goodsId},treatSingleNo = #{treatSingleNo},deductNum = #{deductNum},isUserPro = #{isUserPro},indicationId = #{indicationId},indication = #{indication},partType = #{partType},sdRemark = #{sdRemark},isDel = #{isDel},createTime = #{createTime},editTime = #{editTime}
        </trim>
    </sql>
     
@@ -19,11 +19,11 @@
        <selectKey keyProperty="id" resultType="String" order="BEFORE">
               select replace(uuid(),'-','') from dual
        </selectKey>
        insert into treat_project (id,positionData,projectNo,projectName,price,num,useDuration,palsyDuration,projectId,treatSingleId,remarkInfo,hisId,isDeduct,userProjectItemId,goodsId,treatSingleNo,deductNum,isUserPro,indicationId,indication,partType,sdRemark,isDel,createTime,editTime)  values (#{id},#{positionData},#{projectNo},#{projectName},#{price},#{num},#{useDuration},#{palsyDuration},#{projectId},#{treatSingleId},#{remarkInfo},#{hisId},#{isDeduct},#{userProjectItemId},#{goodsId},#{treatSingleNo},#{deductNum},#{isUserPro},#{indicationId},#{indication},#{partType},#{sdRemark},#{isDel},#{createTime},#{editTime})
        insert into treat_project (id,positionData,projectNo,projectName,price,num,useDuration,palsyDuration,projectId,treatSingleId,remarkInfo,hisId,isDeduct,isUsed,userProjectItemId,goodsId,treatSingleNo,deductNum,isUserPro,indicationId,indication,partType,sdRemark,isDel,createTime,editTime)  values (#{id},#{positionData},#{projectNo},#{projectName},#{price},#{num},#{useDuration},#{palsyDuration},#{projectId},#{treatSingleId},#{remarkInfo},#{hisId},#{isDeduct},#{isUsed},#{userProjectItemId},#{goodsId},#{treatSingleNo},#{deductNum},#{isUserPro},#{indicationId},#{indication},#{partType},#{sdRemark},#{isDel},#{createTime},#{editTime})
    </insert>

    <insert id="insertById" parameterType="com.hx.phiappt.model.treat.TreatProject">
        insert into treat_project (id,positionData,projectNo,projectName,price,num,useDuration,palsyDuration,projectId,treatSingleId,remarkInfo,hisId,isDeduct,userProjectItemId,goodsId,treatSingleNo,deductNum,isUserPro,indicationId,indication,partType,sdRemark,isDel,createTime,editTime)  values (#{id},#{positionData},#{projectNo},#{projectName},#{price},#{num},#{useDuration},#{palsyDuration},#{projectId},#{treatSingleId},#{remarkInfo},#{hisId},#{isDeduct},#{userProjectItemId},#{goodsId},#{treatSingleNo},#{deductNum},#{isUserPro},#{indicationId},#{indication},#{partType},#{sdRemark},#{isDel},#{createTime},#{editTime})
        insert into treat_project (id,positionData,projectNo,projectName,price,num,useDuration,palsyDuration,projectId,treatSingleId,remarkInfo,hisId,isDeduct,isUsed,userProjectItemId,goodsId,treatSingleNo,deductNum,isUserPro,indicationId,indication,partType,sdRemark,isDel,createTime,editTime)  values (#{id},#{positionData},#{projectNo},#{projectName},#{price},#{num},#{useDuration},#{palsyDuration},#{projectId},#{treatSingleId},#{remarkInfo},#{hisId},#{isDeduct},#{isUsed},#{userProjectItemId},#{goodsId},#{treatSingleNo},#{deductNum},#{isUserPro},#{indicationId},#{indication},#{partType},#{sdRemark},#{isDel},#{createTime},#{editTime})
    </insert>

    <select id="selectList" resultType="com.hx.phiappt.model.treat.TreatProject" parameterType="com.hx.mybatisTool.SqlSentence" >
@@ -55,14 +55,14 @@

    <select id="selectOneByKey" resultType="com.hx.phiappt.model.treat.TreatProject" parameterType="java.lang.Object" >
        select 
            id,positionData,projectNo,projectName,price,num,useDuration,palsyDuration,projectId,treatSingleId,remarkInfo,hisId,isDeduct,userProjectItemId,goodsId,treatSingleNo,deductNum,isUserPro,indicationId,indication,partType,sdRemark,isDel,createTime,editTime
            id,positionData,projectNo,projectName,price,num,useDuration,palsyDuration,projectId,treatSingleId,remarkInfo,hisId,isDeduct,isUsed,userProjectItemId,goodsId,treatSingleNo,deductNum,isUserPro,indicationId,indication,partType,sdRemark,isDel,createTime,editTime
        from treat_project
        WHERE id = #{value}
    </select>

    <select id="selectOneByKeyBlob" resultType="com.hx.phiappt.model.treat.TreatProject" parameterType="java.lang.Object" >
        select 
            id,positionData,projectNo,projectName,price,num,useDuration,palsyDuration,projectId,treatSingleId,remarkInfo,hisId,isDeduct,userProjectItemId,goodsId,treatSingleNo,deductNum,isUserPro,indicationId,indication,partType,sdRemark,isDel,createTime,editTime
            id,positionData,projectNo,projectName,price,num,useDuration,palsyDuration,projectId,treatSingleId,remarkInfo,hisId,isDeduct,isUsed,userProjectItemId,goodsId,treatSingleNo,deductNum,isUserPro,indicationId,indication,partType,sdRemark,isDel,createTime,editTime
        from treat_project
        WHERE id = #{value}
    </select>